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

Commit 54937a46 authored by Elis Elliott's avatar Elis Elliott Committed by Automerger Merge Worker
Browse files

Merge "Fix device admin access with permission checks." into udc-dev am: cea6724a am: b3bcfc71 

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



Change-Id: I20ff1551f4285782dee8c2710c968e5703138af0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ac889e90 b3bcfc71

core/java/android/app/admin/DevicePolicyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -6413,7 +6413,7 @@ public class DevicePolicyManager { 
    public void lockNow(@LockNowFlag int flags) {

        if (mService != null) {

            try {

                mService.lockNow(flags, mParentInstance);

                mService.lockNow(flags, mContext.getPackageName(), mParentInstance);

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            }

core/java/android/app/admin/IDevicePolicyManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ interface IDevicePolicyManager { 
    void setRequiredStrongAuthTimeout(in ComponentName who, String callerPackageName, long timeMs, boolean parent);

    long getRequiredStrongAuthTimeout(in ComponentName who, int userId, boolean parent);



    void lockNow(int flags, boolean parent);

    void lockNow(int flags, String callerPackageName, boolean parent);



    /**

    * @param factoryReset only applicable when `targetSdk >= U`, either tries to factoryReset/fail or removeUser/fail otherwise

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

+404 −304

File changed.

Preview size limit exceeded, changes collapsed.