commit bd145dbfd720d0e2ddd879492837da0f47ac11a8
author Dianne Hackborn <hackbod@google.com> Tue Jun 05 16:20:46 2012 -0700
committer Dianne Hackborn <hackbod@google.com> Tue Jun 05 16:20:46 2012 -0700
tree 7e668323bb1c6b9325ab212fce17829f00095f22
parent 1ad66b2f873496bcbe72e91d1978cf1b2633b3a4

Fix issue #6609383: java.lang.SecurityException: Requires...

...MANAGE_APP_TOKENS permission

Bug: 6609383
Change-Id: I5ce8ac1ec496af50477111b46e6daea81181e3ca

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

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 8245d67..63d6fa3 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -6645,7 +6645,12 @@
             // death notification...  just a bit prematurely.
             Slog.i(TAG, "Process " + proc.processName + " (pid " + proc.pid
                     + ") early provider death");
-            appDiedLocked(proc, proc.pid, proc.thread);
+            final long ident = Binder.clearCallingIdentity();
+            try {
+                appDiedLocked(proc, proc.pid, proc.thread);
+            } finally {
+                Binder.restoreCallingIdentity(ident);
+            }
         }
     }