From a2fea355e79d8057e5910f52ef067642b1d46189 Mon Sep 17 00:00:00 2001 From: Dmitry Dementyev Date: Thu, 11 Jul 2024 12:39:22 -0700 Subject: [PATCH] Update AccountManagerService checkKeyIntent. Block intents with "content" data scheme. Bug: 349780950 Test: manual Flag: EXEMPT bugfix (cherry picked from commit c1e79495a49bd4d3e380136fe4bca7ac1a9ed763) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:59b2cc4447fbbdea58840f5b9d885d83241ac5f5) Merged-In: I8b23191d3d60036ca7ddf0ef7dcba6b38fb27b3c Change-Id: I8b23191d3d60036ca7ddf0ef7dcba6b38fb27b3c --- .../com/android/server/accounts/AccountManagerService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java index 19e1a4c55120a..c5fff3652c283 100644 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java @@ -4799,6 +4799,9 @@ protected boolean checkKeyIntent(int authUid, Bundle bundle) { 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);