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

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

@@ -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) {