commit 97fce66f7d6c5803dfa49f7ab9a0d9e9b009082f
author Shawn Willden <swillden@google.com> Fri Apr 10 21:21:36 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 10 21:21:37 2015 +0000
tree 3807d214ccaf26e916c0e58f5ff2b82b6b223f63
parent 4406568ebac6f6bbf627aeb6909b409d948cecf4
parent 59f977c6988e21b3b8aa6c83428bd6ee1a98816d

Merge "Make several key crypto parameters repeatable"

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 5494000..05a4d7e 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