diff options
| author | Jason Monk <jmonk@google.com> | 2014-09-03 14:56:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-03 14:56:50 +0000 |
| commit | c55d9bb774222205a2b81f5c8117a15b8c0b6bb9 (patch) | |
| tree | 58d7ab2013df59e9998bd1d3db853e89c4cf3bd3 | |
| parent | 4eba7aa211ac320309853d39fb5b5e1346827810 (diff) | |
| parent | ab918565722e6921a64dffa1938e4d5f47f6713b (diff) | |
| download | frameworks_base-c55d9bb774222205a2b81f5c8117a15b8c0b6bb9.zip frameworks_base-c55d9bb774222205a2b81f5c8117a15b8c0b6bb9.tar.gz frameworks_base-c55d9bb774222205a2b81f5c8117a15b8c0b6bb9.tar.bz2 | |
am f179010b: am 7023f0f2: Merge "Enforce permissions on start/stopLockTaskModeOnCurrent" into lmp-dev
* commit 'f179010b8bedd9c018d0ba6991db9331efaa4153':
Enforce permissions on start/stopLockTaskModeOnCurrent
| -rwxr-xr-x | services/core/java/com/android/server/am/ActivityManagerService.java | 6 |
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 a3a5709..008ec99 100755 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -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(); |