summaryrefslogtreecommitdiffstats
path: root/services/core/java/com/android/server/am
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2014-09-02 15:38:46 -0400
committerJason Monk <jmonk@google.com>2014-09-02 15:38:46 -0400
commitf71edcaa1446c54956ea5d29a44343361a668755 (patch)
tree5649392a71202ef5813c6dbad370fa4c9a487328 /services/core/java/com/android/server/am
parent2debc99efa952e2da912b459ec51c3264d3deccc (diff)
downloadframeworks_base-f71edcaa1446c54956ea5d29a44343361a668755.zip
frameworks_base-f71edcaa1446c54956ea5d29a44343361a668755.tar.gz
frameworks_base-f71edcaa1446c54956ea5d29a44343361a668755.tar.bz2
Enforce permissions on start/stopLockTaskModeOnCurrent
Bug: 17308601 Change-Id: If3c941e206236023108a55360a627d24ca8ba608
Diffstat (limited to 'services/core/java/com/android/server/am')
-rwxr-xr-xservices/core/java/com/android/server/am/ActivityManagerService.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index c2c86ff..f6857ca 100755
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -8655,7 +8655,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();
@@ -8697,7 +8698,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();