commit 27a388807794fbdff37fcd206e64d28e82e5322b
author Clara Bayarri <clarabayarri@google.com> Thu Jan 21 17:45:59 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 21 17:45:59 2016 +0000
tree b5b96ee842fa19fdaba94eae0a4b8d023c6684a3
parent c9d831d6d6e294d7d0a0df356f187e1a17548562
parent b3ced57764613d050050284049d14fcb0b252330

Merge "Fix missing clear identity in AMS.AppTaskImpl#moveToFront"

services/core/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 9949a97..adb11a4 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -21143,7 +21143,12 @@
         public void moveToFront() {
             checkCaller();
             // Will bring task to front if it already has a root activity.
-            startActivityFromRecentsInner(mTaskId, null);
+            final long origId = Binder.clearCallingIdentity();
+            try {
+                startActivityFromRecentsInner(mTaskId, null);
+            } finally {
+                Binder.restoreCallingIdentity(origId);
+            }
         }
 
         @Override