Propagate callingPackage explicitly within CDM

Activity.getCallingPackage seems to be returning null in come cases

Fixes: 170461416
Bug: 167592848
Test: manual
Change-Id: I507b9434e792f79e7905f1983879a062d1a6fec7
(cherry picked from commit 2a7a57711e8dbe2ac8705350e42a9d3f26a8edae)

1 files changed, 7 insertions, 0 deletions

diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java
index 16ef59f201f1..e501e1269aeb 100644
--- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java
+++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java
@@ -18,6 +18,8 @@ package com.android.companiondevicemanager;
 
 import static android.companion.BluetoothDeviceFilterUtils.getDeviceMacAddress;
 
+import static java.util.Objects.requireNonNull;
+
 import android.app.Activity;
 import android.companion.CompanionDeviceManager;
 import android.content.Intent;
@@ -117,6 +119,11 @@ public class DeviceChooserActivity extends Activity {
     }
 
     @Override
+    public String getCallingPackage() {
+        return requireNonNull(getService().mRequest.getCallingPackage());
+    }
+
+    @Override
     public void setTitle(CharSequence title) {
         final TextView titleView = findViewById(R.id.title);
         final int padding = getPadding(getResources());