commit 0fed3c74101b7c50761d7a63c5fd4ee9a909be8b
author Dmitry Dementyev <dementyev@google.com> Tue Jul 23 20:58:21 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 23 20:58:21 2024 +0000
tree d248e26bbad5a64f341f3daef8355a2b40c02a51
parent 6cc5e7d5fbeb2cbdece3066627418e3b81f61b51
parent 3cf4c7dc8fdd90670355239b224667877e81331a

Update AccountManagerService checkKeyIntent. am: f483640dfc am: dbde7919a5 am: 3cf4c7dc8f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28363641

Change-Id: I8767fe9fee8b7ba2bf257ac09c77ccc61216b1b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/java/com/android/server/accounts/AccountManagerService.java

diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index cea0846..6b454a5 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -4898,6 +4898,9 @@
                 if (resolveInfo == null) {
                     return false;
                 }
+                if ("content".equals(intent.getScheme())) {
+                    return false;
+                }
                 ActivityInfo targetActivityInfo = resolveInfo.activityInfo;
                 int targetUid = targetActivityInfo.applicationInfo.uid;
                 PackageManagerInternal pmi = LocalServices.getService(PackageManagerInternal.class);