Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ae1caf9 authored by Makoto Onuki's avatar Makoto Onuki Committed by Android Git Automerger
Browse files

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

* commit 'e43bf4bb':
  Allow killApplicationWithAppId() on secondary users
parents f86b2096 e43bf4bb

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

+1 −1
Original line number Diff line number Diff line
@@ -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;