commit 6159f6eb231028bc6420edf4157fb335e78aca00
author Olawale Ogunwale <ogunwale@google.com> Fri Apr 10 20:37:00 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 10 20:37:00 2015 +0000
tree fd82be096629c495560f8fe47cbd128bd2771b27
parent 73b56873f1c39d29bc9f98e727b83b05bb74a44d
parent 4406568ebac6f6bbf627aeb6909b409d948cecf4

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

* commit '4406568ebac6f6bbf627aeb6909b409d948cecf4':
  Check caller status precisely when registering receiver.

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 4121e86..dbfb8fb 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -15709,8 +15709,9 @@
         }
 
         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