diff options
| author | Jason Monk <jmonk@google.com> | 2014-09-03 15:36:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-03 15:36:11 +0000 |
| commit | 607b3fb2065311cc56e9f03f1245f9b6524599ed (patch) | |
| tree | 24a7ce1aae5dcf3dcf8282d8f043a214fada813e | |
| parent | c67cae1302569e265b68eceb38789aac5abcaf66 (diff) | |
| parent | c55d9bb774222205a2b81f5c8117a15b8c0b6bb9 (diff) | |
| download | frameworks_base-607b3fb2065311cc56e9f03f1245f9b6524599ed.zip frameworks_base-607b3fb2065311cc56e9f03f1245f9b6524599ed.tar.gz frameworks_base-607b3fb2065311cc56e9f03f1245f9b6524599ed.tar.bz2 | |
am 158e9f91: am f179010b: am 7023f0f2: Merge "Enforce permissions on start/stopLockTaskModeOnCurrent" into lmp-dev
* commit '158e9f91b082afe95c516689535979943730a2eb':
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(); |