Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check broadcasts sent from sandbox process UID for intents without an action as well"

Browse Source
This commit is contained in:
Palak Chaudhary
2023-01-25 12:14:21 +00:00
committed by Android (Google) Code Review
parent bed372e1b3 904870f07f
commit f092b23523
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -14256,6 +14256,16 @@ public class ActivityManagerService extends IActivityManager.Stub
}
}
if (Process.isSdkSandboxUid(realCallingUid)) {
SdkSandboxManagerLocal sdkSandboxManagerLocal = LocalManagerRegistry.getManager(
SdkSandboxManagerLocal.class);
if (sdkSandboxManagerLocal == null) {
throw new IllegalStateException("SdkSandboxManagerLocal not found when sending"
+ " a broadcast from an SDK sandbox uid.");
}
sdkSandboxManagerLocal.enforceAllowedToSendBroadcast(intent);
}
boolean timeoutExempt = false;
if (action != null) {
@@ -14266,16 +14276,6 @@ public class ActivityManagerService extends IActivityManager.Stub
intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
}
if (Process.isSdkSandboxUid(realCallingUid)) {
SdkSandboxManagerLocal sdkSandboxManagerLocal = LocalManagerRegistry.getManager(
SdkSandboxManagerLocal.class);
if (sdkSandboxManagerLocal == null) {
throw new IllegalStateException("SdkSandboxManagerLocal not found when sending"
+ " a broadcast from an SDK sandbox uid.");
}
sdkSandboxManagerLocal.enforceAllowedToSendBroadcast(intent);
}
switch (action) {
case Intent.ACTION_MEDIA_SCANNER_SCAN_FILE:
UserManagerInternal umInternal = LocalServices.getService(