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

Commit 54b7acbb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix permission issue when provisioning." into udc-dev am: bf78a8d1 

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



Change-Id: I8fdae38d68ef9c8d3c35b7d31432493b93ad3f48
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 22d04ba2 bf78a8d1

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

+3 −3
Original line number Diff line number Diff line
@@ -16406,12 +16406,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                    mInjector.getPackageManager().getPackagesForUid(caller.getUid()));

            Preconditions.checkArgument(callerUidPackageNames.contains(packageName),

                    "Caller uid doesn't match the one for the provided package.");

        } finally {

            mInjector.binderRestoreCallingIdentity(ident);

        }















            return checkProvisioningPreconditionSkipPermission(action, packageName, caller.getUserId())















                    == STATUS_OK;













        } finally {













            mInjector.binderRestoreCallingIdentity(ident);













        }















    }





























    @Override