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

Merge "Do not verify client app uid and package when stopping the sandbox" into udc-dev

Browse Source
This commit is contained in:
Sanjana Sunil
2023-03-10 13:32:48 +00:00
committed by Android (Google) Code Review
parent 51018a1bc6 11bb6fbc5e
commit b736edc255
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17279,6 +17279,9 @@ public class ActivityManagerService extends IActivityManager.Stub
public ComponentName startSdkSandboxService(Intent service, int clientAppUid, public ComponentName startSdkSandboxService(Intent service, int clientAppUid,
String clientAppPackage, String processName) throws RemoteException { String clientAppPackage, String processName) throws RemoteException {
validateSdkSandboxParams(service, clientAppUid, clientAppPackage, processName); validateSdkSandboxParams(service, clientAppUid, clientAppPackage, processName);
if (mAppOpsService.checkPackage(clientAppUid, clientAppPackage) != MODE_ALLOWED) {
throw new IllegalArgumentException("uid does not belong to provided package");
}
// TODO(b/269598719): Is passing the application thread of the system_server alright? // TODO(b/269598719): Is passing the application thread of the system_server alright?
// e.g. the sandbox getting privileged access due to this. // e.g. the sandbox getting privileged access due to this.
ComponentName cn = ActivityManagerService.this.startService( ComponentName cn = ActivityManagerService.this.startService(
@@ -17345,6 +17348,9 @@ public class ActivityManagerService extends IActivityManager.Stub
String processName, long flags) String processName, long flags)
throws RemoteException { throws RemoteException {
validateSdkSandboxParams(service, clientAppUid, clientAppPackage, processName); validateSdkSandboxParams(service, clientAppUid, clientAppPackage, processName);
if (mAppOpsService.checkPackage(clientAppUid, clientAppPackage) != MODE_ALLOWED) {
throw new IllegalArgumentException("uid does not belong to provided package");
}
if (conn == null) { if (conn == null) {
throw new IllegalArgumentException("connection is null"); throw new IllegalArgumentException("connection is null");
} }
@@ -17397,9 +17403,6 @@ public class ActivityManagerService extends IActivityManager.Stub
if (!UserHandle.isApp(clientAppUid)) { if (!UserHandle.isApp(clientAppUid)) {
throw new IllegalArgumentException("uid is not within application range"); throw new IllegalArgumentException("uid is not within application range");
} }
if (mAppOpsService.checkPackage(clientAppUid, clientAppPackage) != MODE_ALLOWED) {
throw new IllegalArgumentException("uid does not belong to provided package");
}
} }
@Override @Override