Merge "Fix issue where Keyguard would not be dismissed" (c141090c) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -2527,7 +2527,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		}
		}
		if (dismissShade) {
		if (mExpandedVisible) {
		if (mExpandedVisible && !mBouncerShowing) {
		animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL, true /* force */,
		true /* delayed*/);
		} else {
		@@ -3208,6 +3208,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		mNotificationPanel.onAffordanceLaunchEnded();
		mNotificationPanel.animate().cancel();
		mNotificationPanel.setAlpha(1f);
		updateScrimController();
		Trace.endSection();
		return staying;
		}