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

Commit 451fa53c authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "BroadcastQueue: fix class typo of next receiver" into cm-11.0

parents a2931c05 2efb7764
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -371,17 +371,17 @@ public final class BroadcastQueue {
        if (waitForServices && r.curComponent != null && r.queue.mDelayBehindServices
                && r.queue.mOrderedBroadcasts.size() > 0
                && r.queue.mOrderedBroadcasts.get(0) == r) {
            ActivityInfo nextReceiver;
            ResolveInfo nextReceiver;
            if (r.nextReceiver < r.receivers.size()) {
                Object obj = r.receivers.get(r.nextReceiver);
                nextReceiver = (obj instanceof ActivityInfo) ? (ActivityInfo)obj : null;
                nextReceiver = (obj instanceof ResolveInfo) ? (ResolveInfo)obj : null;
            } else {
                nextReceiver = null;
            }
            // Don't do this if the next receive is in the same process as the current one.
            if (receiver == null || nextReceiver == null
                    || receiver.applicationInfo.uid != nextReceiver.applicationInfo.uid
                    || !receiver.processName.equals(nextReceiver.processName)) {
                    || receiver.applicationInfo.uid != nextReceiver.activityInfo.applicationInfo.uid
                    || !receiver.processName.equals(nextReceiver.activityInfo.processName)) {
                // In this case, we are ready to process the next receiver for the current broadcast,
                // but are on a queue that would like to wait for services to finish before moving
                // on.  If there are background services currently starting, then we will go into a