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

Commit 7f378b1b authored by Ricky Wai's avatar Ricky Wai Committed by android-build-merger
Browse files

Merge "Fix clearDeviceOwner() not working in split-user mode" into nyc-dev 

am: 8bbace3a

* commit '8bbace3a':
  Fix clearDeviceOwner() not working in split-user mode
parents e2e88248 8bbace3a

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -5530,7 +5530,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        Preconditions.checkNotNull(packageName, "packageName is null");

        final int callingUid = mInjector.binderGetCallingUid();

        try {

            int uid = mContext.getPackageManager().getPackageUidAsUser(packageName, 0);

            int uid = mContext.getPackageManager().getPackageUidAsUser(packageName,

                    UserHandle.getUserId(callingUid));

            if (uid != callingUid) {

                throw new SecurityException("Invalid packageName");

            }