diff options
author | Makoto Onuki <omakoto@google.com> | 2015-06-16 00:51:35 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-16 00:51:36 +0000 |
commit | e43bf4bb4511ec756512a44164ff79cce3a02348 (patch) | |
tree | cab7df030af4152e9b4cec8ea768ba08f236146c /services/core | |
parent | d5e5151f6ceab498e3a35928c1f6f7a177c1544e (diff) | |
parent | fa24bd8ab65ac34cc3393ab9a8aa0e24747c4072 (diff) | |
download | frameworks_base-e43bf4bb4511ec756512a44164ff79cce3a02348.zip frameworks_base-e43bf4bb4511ec756512a44164ff79cce3a02348.tar.gz frameworks_base-e43bf4bb4511ec756512a44164ff79cce3a02348.tar.bz2 |
Merge "Allow killApplicationWithAppId() on secondary users" into mnc-dev
Diffstat (limited to 'services/core')
-rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 421ba86..e9b9767 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -5267,7 +5267,7 @@ public final class ActivityManagerService extends ActivityManagerNative } int callerUid = Binder.getCallingUid(); // Only the system server can kill an application - if (callerUid == Process.SYSTEM_UID) { + if (UserHandle.getAppId(callerUid) == Process.SYSTEM_UID) { // Post an aysnc message to kill the application Message msg = mHandler.obtainMessage(KILL_APPLICATION_MSG); msg.arg1 = appid; |