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

Commit 2f4ad45d authored by Jon Larimer's avatar Jon Larimer Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev

parents 6106f6a4 8719f683

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

+2 −2
Original line number Diff line number Diff line
@@ -742,6 +742,8 @@ public final class ActivityStackSupervisor { 
                    aInfo, resultTo, resultWho, requestCode, callingPid, callingUid,

                    callingPackage, startFlags, options, componentSpecified, null);



            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
@@ -755,8 +757,6 @@ public final class ActivityStackSupervisor { 
                mService.updateConfigurationLocked(config, null, false, false);

            }



            Binder.restoreCallingIdentity(origId);



            if (outResult != null) {

                outResult.result = res;

                if (res == ActivityManager.START_SUCCESS) {