mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-14 10:24:32 -05:00
33 lines
1.6 KiB
Diff
33 lines
1.6 KiB
Diff
|
From 9fa4be80e24143b7b7a382659ccb260f129084c1 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:b43f4aebb065059d7bf9bffc31c7893fff5133a1)
|
||
|
|
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 4804050c721f2..56e43b8025c87 100644
|
||
|
|
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
|
||
|
|
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
|
||
|
|
@@ -4220,6 +4220,9 @@ protected boolean checkKeyIntent(int authUid, Intent intent) {
|
||
|
|
if (resolveInfo == null) {
|
||
|
|
return false;
|
||
|
|
}
|
||
|
|
+ if ("content".equals(intent.getScheme())) {
|
||
|
|
+ return false;
|
||
|
|
+ }
|
||
|
|
ActivityInfo targetActivityInfo = resolveInfo.activityInfo;
|
||
|
|
int targetUid = targetActivityInfo.applicationInfo.uid;
|
||
|
|
if (PackageManager.SIGNATURE_MATCH != pm.checkSignatures(authUid, targetUid)) {
|