diff options
| author | Jon Larimer <jlarimer@google.com> | 2015-01-29 17:48:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-29 17:48:24 +0000 |
| commit | 2f4ad45d60aac5b2b025e9eac34e289d406645dc (patch) | |
| tree | e63b740ee5928bec14799814f718437339d83e0c | |
| parent | 6106f6a490cb5816602e8e3ae84a5c653dda44d3 (diff) | |
| parent | 8719f683d2e601501487c03cc5866b29925ddc0b (diff) | |
| download | frameworks_base-2f4ad45d60aac5b2b025e9eac34e289d406645dc.zip frameworks_base-2f4ad45d60aac5b2b025e9eac34e289d406645dc.tar.gz frameworks_base-2f4ad45d60aac5b2b025e9eac34e289d406645dc.tar.bz2 | |
Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
| -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) { |