Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '2f4ad45d60aac5b2b025e9eac34e289d406645dc':
  DO NOT MERGE Restore calling identity before checking permission
This commit is contained in:
Jon Larimer
2015-01-29 17:55:10 +00:00
committed by Android Git Automerger
parent 1dbbc2045a 2f4ad45d60
commit 64d6bacf13
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/am/ActivityStackSupervisor.java
View File

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