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

Commit 7ab0ac69 authored by Jon Larimer's avatar Jon Larimer Committed by Android Git Automerger
Browse files

am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before... 

am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev

* commit '64d6bacf':
  DO NOT MERGE Restore calling identity before checking permission
parents 1e0d4b56 64d6bacf

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

+2 −2
Original line number Diff line number Diff line
@@ -825,6 +825,8 @@ public final class ActivityStackSupervisor implements DisplayListener { 
                    requestCode, callingPid, callingUid, callingPackage, startFlags, options,

                    componentSpecified, null, container);



            Binder.restoreCallingIdentity(origId);



            if (stack.mConfigWillChange) {

                // If the caller also wants to switch to a new configuration,

                // do so now.  This allows a clean switch, as we are waiting
@@ -838,8 +840,6 @@ public final class ActivityStackSupervisor implements DisplayListener { 
                mService.updateConfigurationLocked(config, null, false, false);

            }



            Binder.restoreCallingIdentity(origId);



            if (outResult != null) {

                outResult.result = res;

                if (res == ActivityManager.START_SUCCESS) {