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

2016-01-21 17:45:59 +00:00
parent c9d831d6d6 b3ced57764
commit 27a3888077
1 changed files with 6 additions and 1 deletions
--- 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 final class ActivityManagerService extends ActivityManagerNative
        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