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

Commit 28b9e79b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clear caller identity in doesPackageHaveCallingUid helper method so it... 

Merge "Clear caller identity in doesPackageHaveCallingUid helper method so it can work across users." into sc-v2-dev am: f9de2e24 am: a209c117

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

Change-Id: Ibffdec90c7efb12d8804ab96d33c1e3fd6d6ef58
parents 25792dc1 a209c117

services/core/java/com/android/server/UiModeManagerService.java

+6 −1
Original line number Diff line number Diff line
@@ -1167,11 +1167,16 @@ final class UiModeManagerService extends SystemService { 
    }



    private boolean doesPackageHaveCallingUid(@NonNull String packageName) {

        int callingUid = mInjector.getCallingUid();

        int callingUserId = UserHandle.getUserId(callingUid);

        final long ident = Binder.clearCallingIdentity();

        try {

            return getContext().getPackageManager().getPackageUidAsUser(packageName,

                    UserHandle.getCallingUserId()) == mInjector.getCallingUid();

                    callingUserId) == callingUid;

        } catch (PackageManager.NameNotFoundException e) {

            return false;

        } finally {

            Binder.restoreCallingIdentity(ident);

        }

    }