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

am 966c3183: am 64dc5b09: am 20b338d9: Merge "Restore calling identity before checking permission" into lmp-dev

Browse Source 
* commit '966c31831b352727a37bf75b8156a4e98dfb12c2':
  Restore calling identity before checking permission
This commit is contained in:
Craig Mautner
2014-07-17 22:00:10 +00:00
committed by Android Git Automerger
parent 9ad52db9fd 68ad9d762d
commit 0855ea7b75
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

@@ -907,6 +907,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
@@ -920,8 +922,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) {