Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5033c1ef authored by Olawale Ogunwale's avatar Olawale Ogunwale Committed by Android Git Automerger
Browse files

am 448cb9f9: am 6159f6eb: am 4406568e: Merge "Check caller status precisely... 

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

* commit '448cb9f9':
  Check caller status precisely when registering receiver.
parents 041a9e57 448cb9f9

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -15498,8 +15498,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