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

Commit 615efcdc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I2025de2d794c71bba0840dcf3b0d28361d70af65
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dde831ce f994548c

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

+11 −5
Original line number Original line 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 =

                final boolean isAllowedPackage =

                        mAllowListWhileInUsePermissionInFgs.contains(callingPackage);

                        mAllowListWhileInUsePermissionInFgs.contains(callingPackage);

                if (isAllowedPackage) {

                if (isAllowedPackage) {

                    ret = REASON_ALLOWLISTED_PACKAGE;

                    ret = REASON_ALLOWLISTED_PACKAGE;

                }

                }

            } else {

                EventLog.writeEvent(0x534e4554, "215003903", callingUid,

                        "callingPackage:" + callingPackage + " does not belong to callingUid:"

                                + callingUid);

            }

        }

        }





        if (ret == REASON_DENIED) {

        if (ret == REASON_DENIED) {