Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '4406568ebac6f6bbf627aeb6909b409d948cecf4':
  Check caller status precisely when registering receiver.
This commit is contained in:
Olawale Ogunwale
2015-04-10 20:37:00 +00:00
committed by Android Git Automerger
parent 73b56873f1 4406568eba
commit 6159f6eb23
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -15709,8 +15709,9 @@ public final class ActivityManagerService extends ActivityManagerNative
} }
synchronized (this) { synchronized (this) {
if (callerApp != null && callerApp.pid == 0) { if (callerApp != null && (callerApp.thread == null
// Caller already died || callerApp.thread.asBinder() != caller.asBinder())) {
// Original caller already died
return null; return null;
} }
ReceiverList rl ReceiverList rl