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