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

Commit 7dd12d76 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 jb-mr2-dev

parents 9a6143fa 7dba93c0

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

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

                    callingPackage, startFlags, options, componentSpecified, null);

            

            Binder.restoreCallingIdentity(origId);



            if (mConfigWillChange && mMainStack) {

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

                // do so now.  This allows a clean switch, as we are waiting
@@ -3221,8 +3223,6 @@ final class ActivityStack { 
                mService.updateConfigurationLocked(config, null, false, false);

            }

            

            Binder.restoreCallingIdentity(origId);

            

            if (outResult != null) {

                outResult.result = res;

                if (res == ActivityManager.START_SUCCESS) {