diff options
| author | Eugene Susla <eugenesusla@google.com> | 2020-10-27 12:47:25 -0700 |
|---|---|---|
| committer | Eugene Susla <eugenesusla@google.com> | 2020-11-09 21:34:37 +0000 |
| commit | 22d9d16e782c29f43aee8072b4c3d33aa74ff8ef (patch) | |
| tree | 0f3ce9a41bb98bd5038e0dc208e82d5138bd1b25 /packages/CompanionDeviceManager | |
| parent | d3a425504e546c15cb93f4a621738b9982244885 (diff) | |
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)
Diffstat (limited to 'packages/CompanionDeviceManager')
| -rw-r--r-- | packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java | 7 |
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()); |