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

Commit 62969048 authored by Svetoslav's avatar Svetoslav Committed by Android Git Automerger
Browse files

am d3f88dd4: am 80ce4ad6: Merge "Clear binder id after a permissions check... 

am d3f88dd4: am 80ce4ad6: Merge "Clear binder id after a permissions check before killing a UID." into mnc-dev

* commit 'd3f88dd4':
  Clear binder id after a permissions check before killing a UID.
parents a72cba94 d3f88dd4

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

+9 −3
Original line number Original line Diff line number Diff line
@@ -11049,9 +11049,15 @@ public final class ActivityManagerService extends ActivityManagerNative 
    public void killUid(int uid, String reason) {

    public void killUid(int uid, String reason) {

        enforceCallingPermission(Manifest.permission.KILL_UID, "killUid");

        enforceCallingPermission(Manifest.permission.KILL_UID, "killUid");

        synchronized (this) {

        synchronized (this) {

            killPackageProcessesLocked(null, UserHandle.getAppId(uid), UserHandle.getUserId(uid),

            final long identity = Binder.clearCallingIdentity();

                    ProcessList.FOREGROUND_APP_ADJ-1, false, true, true, false,

            try {

                killPackageProcessesLocked(null, UserHandle.getAppId(uid),

                        UserHandle.getUserId(uid),

                        ProcessList.PERSISTENT_PROC_ADJ, false, true, true, true,

                        reason != null ? reason : "kill uid");

                        reason != null ? reason : "kill uid");

            } finally {

                Binder.restoreCallingIdentity(identity);

            }

        }

        }

    }

    }