summaryrefslogtreecommitdiff
path: root/services/companion
diff options
context:
space:
mode:
authorEugene Susla <eugenesusla@google.com>2020-11-10 02:37:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-10 02:37:48 +0000
commitc15b5cc4cda12377fd47386319789101988f838f (patch)
treec4425e165b8ac26554326b620da13a6950b294ef /services/companion
parente618d32b072f53c098f410fa14e9251522b6f3fe (diff)
parent0454090eb6949dc42cb0dbf79c88c579492f26e2 (diff)
Merge "Propagate callingPackage explicitly within CDM" into rvc-qpr-dev am: 0454090eb6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12999711 Change-Id: I2c554ed2c26b73417ec7d1de2fb1e4f6129b6432
Diffstat (limited to 'services/companion')
-rw-r--r--services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
index 53c725928c78..34d46bc868ae 100644
--- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
+++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
@@ -300,6 +300,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
mFindDeviceCallback = callback;
mRequest = request;
mCallingPackage = callingPackage;
+ request.setCallingPackage(callingPackage);
callback.asBinder().linkToDeath(CompanionDeviceManagerService.this /* recipient */, 0);
final long callingIdentity = Binder.clearCallingIdentity();