Merge "AOD: Only play wakeup animation when actually waking up" into oc-mr1-dev (a72c8a7f) · Commits · e / os / android_frameworks_base

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -5261,8 +5261,7 @@ public class StatusBar extends SystemUI implements DemoMode,

		private void maybePrepareWakeUpFromAod() {
		int wakefulness = mWakefulnessLifecycle.getWakefulness();
		if (mDozing && (wakefulness == WAKEFULNESS_WAKING
		\|\| wakefulness == WAKEFULNESS_ASLEEP) && !isPulsing()) {
		if (mDozing && wakefulness == WAKEFULNESS_WAKING && !isPulsing()) {
		mScrimController.prepareWakeUpFromAod();
		}
		}