diff options
| author | Jon Larimer <jlarimer@google.com> | 2015-01-29 17:55:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 17:55:10 +0000 |
| commit | 64d6bacf13e4ae913c52b773439a542dc5b2b714 (patch) | |
| tree | 7da90026b627a663299758d8613056f103eb9fe4 | |
| parent | 1dbbc2045ae16a4923b30c9576703d02a4363529 (diff) | |
| parent | 2f4ad45d60aac5b2b025e9eac34e289d406645dc (diff) | |
| download | frameworks_base-64d6bacf13e4ae913c52b773439a542dc5b2b714.zip frameworks_base-64d6bacf13e4ae913c52b773439a542dc5b2b714.tar.gz frameworks_base-64d6bacf13e4ae913c52b773439a542dc5b2b714.tar.bz2 | |
am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
* commit '2f4ad45d60aac5b2b025e9eac34e289d406645dc':
DO NOT MERGE Restore calling identity before checking permission
| -rw-r--r-- | services/java/com/android/server/am/ActivityStackSupervisor.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/am/ActivityStackSupervisor.java b/services/java/com/android/server/am/ActivityStackSupervisor.java index d616f1b..fb5fe5c 100644 --- a/services/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/java/com/android/server/am/ActivityStackSupervisor.java @@ -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) { |