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

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

Browse Source 
* commit '64d6bacf13e4ae913c52b773439a542dc5b2b714':
  DO NOT MERGE Restore calling identity before checking permission
This commit is contained in:
Jon Larimer
2015-01-29 18:02:27 +00:00
committed by Android Git Automerger
parent 1e0d4b5611 64d6bacf13
commit 7ab0ac6927
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -825,6 +825,8 @@ public final class ActivityStackSupervisor implements DisplayListener {
requestCode, callingPid, callingUid, callingPackage, startFlags, options,
componentSpecified, null, container);
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
@@ -838,8 +840,6 @@ public final class ActivityStackSupervisor implements DisplayListener {
mService.updateConfigurationLocked(config, null, false, false);
}
Binder.restoreCallingIdentity(origId);
if (outResult != null) {
outResult.result = res;
if (res == ActivityManager.START_SUCCESS) {