Merge "Change the app compat check for mutable implicit pending intents" into udc-dev

2023-05-10 09:23:18 +00:00
parent b1cd493738 b87c33dc45
commit db35df7ecc
1 changed files with 1 additions and 1 deletions
--- 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(