mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-15 02:44:23 -05:00
33 lines
1.5 KiB
Diff
33 lines
1.5 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dmitry Dementyev <dementyev@google.com>
|
||
|
|
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 45c56e41d7fb..95fd335bc11c 100644
|
||
|
|
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
|
||
|
|
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
|
||
|
|
@@ -4779,6 +4779,9 @@ public class AccountManagerService
|
||
|
|
if (resolveInfo == null) {
|
||
|
|
return false;
|
||
|
|
}
|
||
|
|
+ if ("content".equals(intent.getScheme())) {
|
||
|
|
+ return false;
|
||
|
|
+ }
|
||
|
|
ActivityInfo targetActivityInfo = resolveInfo.activityInfo;
|
||
|
|
int targetUid = targetActivityInfo.applicationInfo.uid;
|
||
|
|
if (!isExportedSystemActivity(targetActivityInfo)
|