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

Merge "Merge "Add SafetyNet logging for security fix." into tm-dev am: ff27baadf8 am: 2a0c5501d0" into tm-d1-dev-plus-aosp am: 874e4687ef

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

Change-Id: I61b62a5245a23c4539972cfe6f6f70bd296b8330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Automerger Merge Worker
2022-05-13 03:18:29 +00:00
parent 4d4a743785 874e4687ef
commit 917854dddc
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6475,11 +6475,17 @@ public final class ActiveServices {
} }
} }
if (ret == REASON_DENIED && verifyPackage(callingPackage, callingUid)) { if (ret == REASON_DENIED) {
final boolean isAllowedPackage = if (verifyPackage(callingPackage, callingUid)) {
mAllowListWhileInUsePermissionInFgs.contains(callingPackage); final boolean isAllowedPackage =
if (isAllowedPackage) { mAllowListWhileInUsePermissionInFgs.contains(callingPackage);
ret = REASON_ALLOWLISTED_PACKAGE; if (isAllowedPackage) {
ret = REASON_ALLOWLISTED_PACKAGE;
}
} else {
EventLog.writeEvent(0x534e4554, "215003903", callingUid,
"callingPackage:" + callingPackage + " does not belong to callingUid:"
+ callingUid);
} }
} }