From d06f5abe4ca1c9d3af1c6a1af66a3eddc2641e55 Mon Sep 17 00:00:00 2001 From: huiyu Date: Thu, 12 May 2022 11:05:45 -0700 Subject: [PATCH] Add SafetyNet logging for security fix. Bug: 216695100 Bug: 215003903 Test: atest cts/tests/app/src/android/app/cts/ActivityManagerFgsBgStartTest.java#testSpoofPackageName Change-Id: Ia7601091b0eac50f84f5e95f929f181b0948aba4 --- .../com/android/server/am/ActiveServices.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index 216c9dc4375eb..48b3d0e106d33 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -6475,11 +6475,17 @@ public final class ActiveServices { } } - if (ret == REASON_DENIED && verifyPackage(callingPackage, callingUid)) { - final boolean isAllowedPackage = - mAllowListWhileInUsePermissionInFgs.contains(callingPackage); - if (isAllowedPackage) { - ret = REASON_ALLOWLISTED_PACKAGE; + if (ret == REASON_DENIED) { + if (verifyPackage(callingPackage, callingUid)) { + final boolean isAllowedPackage = + mAllowListWhileInUsePermissionInFgs.contains(callingPackage); + if (isAllowedPackage) { + ret = REASON_ALLOWLISTED_PACKAGE; + } + } else { + EventLog.writeEvent(0x534e4554, "215003903", callingUid, + "callingPackage:" + callingPackage + " does not belong to callingUid:" + + callingUid); } }