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

Commit efed8e3d authored Mar 05, 2019 by TreeHugger Robot Committed by Android (Google) Code Review Mar 05, 2019

Merge "Make sure to deliver broadcasts immediately when waiting for idle"

parents 1a60c727 01c3ae19

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

+3 −5

Original line number	Diff line number	Diff line
		@@ -617,12 +617,10 @@ public class BroadcastDispatcher {
		* Cancel all current deferrals; that is, make all currently-deferred broadcasts
		* immediately deliverable. Used by the wait-for-broadcast-idle mechanism.
		*/
		public void cancelDeferrals() {
		synchronized (mLock) {
		public void cancelDeferralsLocked() {
		zeroDeferralTimes(mAlarmBroadcasts);
		zeroDeferralTimes(mDeferredBroadcasts);
		}
		}

		private static void zeroDeferralTimes(ArrayList<Deferrals> list) {
		final int num = list.size();

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -1870,7 +1870,10 @@ public final class BroadcastQueue {
		// Used by wait-for-broadcast-idle : fast-forward all current deferrals to
		// be immediately deliverable.
		void cancelDeferrals() {
		mDispatcher.cancelDeferrals();
		synchronized (mService) {
		mDispatcher.cancelDeferralsLocked();
		scheduleBroadcastsLocked();
		}
		}

		String describeState() {