Merge "Merge "Add SafetyNet logging for security fix." into tm-dev am:... (874e4687) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActiveServices.java

+11 −5

Original line number	Diff line number	Diff line
		@@ -6475,12 +6475,18 @@ public final class ActiveServices {
		}
		}

		if (ret == REASON_DENIED && verifyPackage(callingPackage, callingUid)) {
		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);
		}
		}

		if (ret == REASON_DENIED) {