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

Merge "Visibility checks for checkPackage and watchingMode" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-02-04 21:47:07 +00:00
committed by Android (Google) Code Review
parent 55825003e3 917c63fca6
commit 3354538079
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/appop/AppOpsService.java
View File

@@ -2796,6 +2796,8 @@ public class AppOpsService extends IAppOpsService.Stub {
if (callback == null) {
return;
}
final boolean mayWatchPackageName =
packageName != null && !filterAppAccessUnlocked(packageName);
synchronized (this) {
int switchOp = (op != AppOpsManager.OP_NONE) ? AppOpsManager.opToSwitch(op) : op;
@@ -2824,7 +2826,7 @@ public class AppOpsService extends IAppOpsService.Stub {
}
cbs.add(cb);
}
if (packageName != null) {
if (mayWatchPackageName) {
ArraySet<ModeCallback> cbs = mPackageModeWatchers.get(packageName);
if (cbs == null) {
cbs = new ArraySet<>();
@@ -3008,13 +3010,27 @@ public class AppOpsService extends IAppOpsService.Stub {
Objects.requireNonNull(packageName);
try {
verifyAndGetBypass(uid, packageName, null);
if (filterAppAccessUnlocked(packageName)) {
return AppOpsManager.MODE_ERRORED;
}
return AppOpsManager.MODE_ALLOWED;
} catch (SecurityException ignored) {
return AppOpsManager.MODE_ERRORED;
}
}
/**
* This method will check with PackageManager to determine if the package provided should
* be visible to the {@link Binder#getCallingUid()}.
*
* NOTE: This must not be called while synchronized on {@code this} to avoid dead locks
*/
private boolean filterAppAccessUnlocked(String packageName) {
final int callingUid = Binder.getCallingUid();
return LocalServices.getService(PackageManagerInternal.class)
.filterAppAccess(packageName, callingUid, UserHandle.getUserId(callingUid));
}
@Override
public int noteProxyOperation(int code, int proxiedUid, String proxiedPackageName,
String proxiedAttributionTag, int proxyUid, String proxyPackageName,