diff options
| author | 2023-05-10 09:43:32 +0000 | |
|---|---|---|
| committer | 2023-05-10 09:43:32 +0000 | |
| commit | 09e21c53efcbf60d9b03dcf7680a3da39e236495 (patch) | |
| tree | a06009f28054d8b7f140139bf5fb1c777536c1f5 | |
| parent | 46dc3b78b9f1d5a224df94ef3145b16b5533953e (diff) | |
| parent | db35df7ecc070f8c40251335d8035d2987010d09 (diff) | |
Merge "Change the app compat check for mutable implicit pending intents" into udc-dev am: db35df7ecc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22988305
Change-Id: I0e539274be9734a418d21e1fc095461775c8b89f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index a4cd2780bec6..df5b83a4c1b3 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -5226,7 +5226,7 @@ public class ActivityManagerService extends IActivityManager.Stub isActivityResultType)) { boolean isChangeEnabled = CompatChanges.isChangeEnabled( PendingIntent.BLOCK_MUTABLE_IMPLICIT_PENDING_INTENT, - owningUid); + packageName, UserHandle.of(userId)); String resolvedType = resolvedTypes == null || i >= resolvedTypes.length ? null : resolvedTypes[i]; ActivityManagerUtils.logUnsafeIntentEvent( |