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

Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into tm-dev

Browse Source
This commit is contained in:
Hui Yu
2022-05-12 16:40:05 +00:00
committed by Android (Google) Code Review
parent 6a69a2c844 7fa1b4d065
commit c872b77284
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -6475,7 +6475,7 @@ public final class ActiveServices {
}
}
if (ret == REASON_DENIED) {
if (ret == REASON_DENIED && verifyPackage(callingPackage, callingUid)) {
final boolean isAllowedPackage =
mAllowListWhileInUsePermissionInFgs.contains(callingPackage);
if (isAllowedPackage) {
@@ -6882,4 +6882,19 @@ public final class ActiveServices {
/* allowBackgroundActivityStarts */ false)
!= REASON_DENIED;
}
/**
* Checks if a given packageName belongs to a given uid.
* @param packageName the package of the caller
* @param uid the uid of the caller
* @return true or false
*/
private boolean verifyPackage(String packageName, int uid) {
if (uid == ROOT_UID || uid == SYSTEM_UID) {
//System and Root are always allowed
return true;
}
return mAm.getPackageManagerInternal().isSameApp(packageName, uid,
UserHandle.getUserId(uid));
}
}