Merge "Fixed an issue where the collapsing was called on the wrong thread" (32bfe882) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+10 −6

Original line number	Diff line number	Diff line
		@@ -4985,7 +4985,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		notificationKey)) {
		// Show work challenge, do not run PendingIntent and
		// remove notification
		collapsePanel();
		collapseOnMainThread();
		return;
		}
		}
		@@ -5026,11 +5026,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		}
		}
		if (shouldCollapse()) {
		if (Looper.getMainLooper().isCurrentThread()) {
		collapsePanel();
		} else {
		mStackScroller.post(this::collapsePanel);
		}
		collapseOnMainThread();
		}

		try {
		@@ -5058,6 +5054,14 @@ public class StatusBar extends SystemUI implements DemoMode,
		}, afterKeyguardGone);
		}

		private void collapseOnMainThread() {
		if (Looper.getMainLooper().isCurrentThread()) {
		collapsePanel();
		} else {
		mStackScroller.post(this::collapsePanel);
		}
		}

		private boolean shouldCollapse() {
		return mState != StatusBarState.SHADE \|\| !mActivityLaunchAnimator.isAnimationPending();
		}