diff options
| author | Eugene Susla <eugenesusla@google.com> | 2020-08-31 19:59:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-31 19:59:38 +0000 |
| commit | 6742862495ad4fe940ed7a0e16ee24fa8ae0f0d5 (patch) | |
| tree | fb7ccd1206e4155a5099873de08484abb90404de /services/companion | |
| parent | 6e92071890ad0b7e806542e589d906340fc1fad8 (diff) | |
| parent | 2a59e10d691642d6e50d7855190d5b837bb663cd (diff) | |
Merge "Fix CDM.requestNotificationAccess() in profile." am: ca576d4b3b am: 2a59e10d69
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1415449
Change-Id: I97e8bc22abece60aca575e63c2aa688f4035b64a
Diffstat (limited to 'services/companion')
| -rw-r--r-- | services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java index d6759b3e2cca..a704c58a9b70 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java @@ -391,12 +391,14 @@ public class CompanionDeviceManagerService extends SystemService implements Bind .toString()); long identity = Binder.clearCallingIdentity(); try { - return PendingIntent.getActivity(getContext(), + return PendingIntent.getActivityAsUser(getContext(), 0 /* request code */, NotificationAccessConfirmationActivityContract.launcherIntent( userId, component, packageTitle), PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_ONE_SHOT - | PendingIntent.FLAG_CANCEL_CURRENT); + | PendingIntent.FLAG_CANCEL_CURRENT, + null /* options */, + new UserHandle(userId)); } finally { Binder.restoreCallingIdentity(identity); } |