commit 3cf4c7dc8fdd90670355239b224667877e81331a
author Dmitry Dementyev <dementyev@google.com> Tue Jul 23 20:35:30 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 23 20:35:30 2024 +0000
tree 2fe00b5ea245c8c56bd86304d280e4169ec79f81
parent cd6b6687ab2bcccc542a524a8abca306cefad3d3
parent dbde7919a5542749d32e62cbb261751af4913764

Update AccountManagerService checkKeyIntent. am: f483640dfc am: dbde7919a5

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

Change-Id: Id14d3d35be7437cf3b8bfb08acb8591975e62ddf
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 43944b0..d55be44 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -4895,6 +4895,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);