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

Commit cc1f2c08 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Enforce permissions on start/stopLockTaskModeOnCurrent" into lmp-dev

parents 0c06d6bf f71edcaa

services/core/java/com/android/server/am/ActivityManagerService.java

+4 −2
Original line number Diff line number Diff line
@@ -8685,7 +8685,8 @@ public final class ActivityManagerService extends ActivityManagerNative 














    @Override















    public void startLockTaskModeOnCurrent() throws RemoteException {













        checkCallingPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS);













        enforceCallingPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS,













                "startLockTaskModeOnCurrent");















        ActivityRecord r = null;















        synchronized (this) {















            r = mStackSupervisor.topRunningActivityLocked();










@@ -8727,7 +8728,8 @@ public final class ActivityManagerService extends ActivityManagerNative



























    @Override















    public void stopLockTaskModeOnCurrent() throws RemoteException {













        checkCallingPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS);













        enforceCallingPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS,













                "stopLockTaskModeOnCurrent");















        long ident = Binder.clearCallingIdentity();















        try {















            stopLockTaskMode();