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

Commit 8657d8e5 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] Make sure callingPackage belongs to callingUid when checking... 

[automerge] Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions. 2p: eef20391

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

Bug: 216695100
Bug: 215003903
Change-Id: Icebad6fec11dc0abe4784a0f8f04177f9f346b64
Merged-In: Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89
parents a3452e42 eef20391

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

+27 −4
Original line number Diff line number Diff line
@@ -5992,11 +5992,17 @@ public final class ActiveServices { 
        }



        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) {
@@ -6378,4 +6384,21 @@ public final class ActiveServices { 
                /* allowBackgroundActivityStarts */ false)

                != REASON_DENIED;

    }



    /**

     * Checks if a given packageName belongs to a given uid.

     * @param packageName the package of the caller

     * @param uid the uid of the caller

     * @return true or false

     */

    private boolean verifyPackage(String packageName, int uid) {

        if (uid == ROOT_UID || uid == SYSTEM_UID) {

            //System and Root are always allowed

            return true;

        }

        final int userId = UserHandle.getUserId(uid);

        final int packageUid = mAm.getPackageManagerInternal()

                .getPackageUid(packageName, PackageManager.MATCH_DEBUG_TRIAGED_MISSING, userId);

        return UserHandle.isSameApp(uid, packageUid);

    }

}