am 6159f6eb: am 4406568e: Merge "Check caller status precisely when registering receiver."

* commit '6159f6eb231028bc6420edf4157fb335e78aca00': Check caller status precisely when registering receiver.
2015-04-10 20:48:21 +00:00
parent e0233e7e11 6159f6eb23
commit 448cb9f9ee
1 changed files with 3 additions and 2 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -15709,8 +15709,9 @@ public final class ActivityManagerService extends ActivityManagerNative
        }

        synchronized (this) {
-            if (callerApp != null && callerApp.pid == 0) {
-                // Caller already died
+            if (callerApp != null && (callerApp.thread == null
+                    || callerApp.thread.asBinder() != caller.asBinder())) {
+                // Original caller already died
                return null;
            }
            ReceiverList rl