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

am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev

Browse Source 
* commit 'd0318a63e51107d5589d8970b079c27d8f788c5a':
  DO NOT MERGE Restore calling identity before checking permission
This commit is contained in:
Jon Larimer
2015-01-29 18:11:57 +00:00
committed by Android Git Automerger
parent 9352296810 d0318a63e5
commit 76cdbb0475
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/ActivityStack.java
View File

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