diff options
| author | Craig Mautner <cmautner@google.com> | 2014-07-17 19:51:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-17 17:59:02 +0000 |
| commit | e2e280ec591d59f47d55b8a8552de2f4c7fb1636 (patch) | |
| tree | c015852028eb5dde1b2015e137caeb4e75345f9e /services | |
| parent | 69b86207bf46f3588a80fee65e0dee2545c157be (diff) | |
| parent | 85c11a8831ba9572813f122674b3680ae4d14010 (diff) | |
| download | frameworks_base-e2e280ec591d59f47d55b8a8552de2f4c7fb1636.zip frameworks_base-e2e280ec591d59f47d55b8a8552de2f4c7fb1636.tar.gz frameworks_base-e2e280ec591d59f47d55b8a8552de2f4c7fb1636.tar.bz2 | |
Merge "Restore calling identity before checking permission" into lmp-dev
Diffstat (limited to 'services')
| -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 8c8d14b..4cfd042 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -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) { |