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 am: c872b77284

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18214570

Change-Id: Ia83b1c69dedc35e6895f724ab950ad90d8db13d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hui Yu
2022-05-12 17:45:36 +00:00
committed by Automerger Merge Worker
parent 92b65722f8 c872b77284
commit 94c2c6230d
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 = final boolean isAllowedPackage =
mAllowListWhileInUsePermissionInFgs.contains(callingPackage); mAllowListWhileInUsePermissionInFgs.contains(callingPackage);
if (isAllowedPackage) { if (isAllowedPackage) {
@@ -6882,4 +6882,19 @@ public final class ActiveServices {
/* allowBackgroundActivityStarts */ false) /* allowBackgroundActivityStarts */ false)
!= REASON_DENIED; != 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));
}
} }