diff options
| author | Makoto Onuki <omakoto@google.com> | 2015-06-15 17:26:40 -0700 |
|---|---|---|
| committer | Makoto Onuki <omakoto@google.com> | 2015-06-15 17:32:00 -0700 |
| commit | fa24bd8ab65ac34cc3393ab9a8aa0e24747c4072 (patch) | |
| tree | d8daa17b4ee5422ea51881c9cd2615a6b92e6abb /services/core | |
| parent | 9f6d39f84423d59705c0c7a8746d40cc610caee7 (diff) | |
| download | frameworks_base-fa24bd8ab65ac34cc3393ab9a8aa0e24747c4072.zip frameworks_base-fa24bd8ab65ac34cc3393ab9a8aa0e24747c4072.tar.gz frameworks_base-fa24bd8ab65ac34cc3393ab9a8aa0e24747c4072.tar.bz2 | |
Allow killApplicationWithAppId() on secondary users
Bug 20949609
Change-Id: If0e766aeb3e8b4aa6aebed3b75bcedd75251e382
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; |