Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 917854dd authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Add SafetyNet logging for security fix." into tm-dev am:... 

Merge "Merge "Add SafetyNet logging for security fix." into tm-dev am: ff27baad am: 2a0c5501" into tm-d1-dev-plus-aosp am: 874e4687

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



Change-Id: I61b62a5245a23c4539972cfe6f6f70bd296b8330
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d4a7437 874e4687

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) {