commit e43bf4bb4511ec756512a44164ff79cce3a02348
author Makoto Onuki <omakoto@google.com> Tue Jun 16 00:51:35 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 16 00:51:36 2015 +0000
tree cab7df030af4152e9b4cec8ea768ba08f236146c
parent d5e5151f6ceab498e3a35928c1f6f7a177c1544e
parent fa24bd8ab65ac34cc3393ab9a8aa0e24747c4072

Merge "Allow killApplicationWithAppId() on secondary users" into mnc-dev

services/core/java/com/android/server/am/ActivityManagerService.java

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 @@
         }
         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;