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

Commit a7c44f04 authored by Kevin Jeon's avatar Kevin Jeon Committed by Automerger Merge Worker
Browse files

Merge "Move permission-by-UID check earlier" into main am: d8c71d28 am: a7f8e727 

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



Change-Id: I42075d3d3221a41b8d3bfa419adf6b77ef76410e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 58c73246 a7f8e727

core/java/android/permission/PermissionManager.java

+6 −12
Original line number Diff line number Diff line
@@ -1716,20 +1716,14 @@ public final class PermissionManager { 


    private static int checkPermissionUncached(@Nullable String permission, int pid, int uid,

            int deviceId) {

        final IActivityManager am = ActivityManager.getService();

        if (am == null) {

            // Well this is super awkward; we somehow don't have an active ActivityManager

            // instance. If we're testing a root or system UID, then they totally have whatever

            // permission this is.

        final int appId = UserHandle.getAppId(uid);

        if (appId == Process.ROOT_UID || appId == Process.SYSTEM_UID) {

                if (sShouldWarnMissingActivityManager) {

                    Slog.w(LOG_TAG, "Missing ActivityManager; assuming " + uid + " holds "

                            + permission);

                    sShouldWarnMissingActivityManager = false;

                }

            return PackageManager.PERMISSION_GRANTED;

        }

        final IActivityManager am = ActivityManager.getService();

        if (am == null) {

            // We don't have an active ActivityManager instance and the calling UID is not root or

            // system, so we don't grant this permission.

            Slog.w(LOG_TAG, "Missing ActivityManager; assuming " + uid + " does not hold "

                    + permission);

            return PackageManager.PERMISSION_DENIED;