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

Merge "Enforce permission checks for recordBroadcastResponseStats API."

Browse Source
This commit is contained in:
Sudheer Shanka
2022-02-02 19:10:47 +00:00
committed by Android (Google) Code Review
parent 0cd1d1d476 be39abaa49
commit d7c5ca769d
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2901,16 +2901,31 @@ public class ActivityManagerService extends IActivityManager.Stub
mActivityTaskManager.setPackageScreenCompatMode(packageName, mode);
}
private boolean hasUsageStatsPermission(String callingPackage) {
private boolean hasUsageStatsPermission(String callingPackage, int callingUid, int callingPid) {
final int mode = mAppOpsService.noteOperation(AppOpsManager.OP_GET_USAGE_STATS,
Binder.getCallingUid(), callingPackage, null, false, "", false).getOpMode();
callingUid, callingPackage, null, false, "", false).getOpMode();
if (mode == AppOpsManager.MODE_DEFAULT) {
return checkCallingPermission(Manifest.permission.PACKAGE_USAGE_STATS)
return checkPermission(Manifest.permission.PACKAGE_USAGE_STATS, callingPid, callingUid)
== PackageManager.PERMISSION_GRANTED;
}
return mode == AppOpsManager.MODE_ALLOWED;
}
private boolean hasUsageStatsPermission(String callingPackage) {
return hasUsageStatsPermission(callingPackage,
Binder.getCallingUid(), Binder.getCallingPid());
}
private void enforceUsageStatsPermission(String callingPackage,
int callingUid, int callingPid, String operation) {
if (!hasUsageStatsPermission(callingPackage, callingUid, callingPid)) {
final String errorMsg = "Permission denial for <" + operation + "> from pid="
+ Binder.getCallingPid() + ", uid=" + Binder.getCallingUid()
+ " which requires PACKAGE_USAGE_STATS permission";
throw new SecurityException(errorMsg);
}
}
@Override
public int getPackageProcessState(String packageName, String callingPackage) {
if (!hasUsageStatsPermission(callingPackage)) {
@@ -13349,6 +13364,13 @@ public class ActivityManagerService extends IActivityManager.Stub
backgroundActivityStartsToken = null;
}
}
// TODO (206518114): We need to use the "real" package name which sent the broadcast,
// in case the broadcast is sent via PendingIntent.
if (brOptions.getIdForResponseEvent() > 0) {
enforceUsageStatsPermission(callerPackage, realCallingUid, realCallingPid,
"recordResponseEventWhileInBackground()");
}
}
// Verify that protected broadcasts are only being sent by system code,