Merge "Moving fail safe animation cancel to power key-up case." (02224b53) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/policy/PhoneWindowManager.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -917,9 +917,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {

		mWindowManagerFuncs.onPowerKeyDown(interactive);

		// Abort possibly stuck animations.
		mHandler.post(mWindowManagerFuncs::triggerAnimationFailsafe);

		// Latch power key state to detect screenshot chord.
		if (interactive && !mScreenshotChordPowerKeyTriggered
		&& (event.getFlags() & KeyEvent.FLAG_FALLBACK) == 0) {
		@@ -1026,6 +1023,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		cancelPendingPowerKeyAction();

		if (!handled) {
		if ((event.getFlags() & KeyEvent.FLAG_LONG_PRESS) == 0) {
		// Abort possibly stuck animations only when power key up without long press case.
		mHandler.post(mWindowManagerFuncs::triggerAnimationFailsafe);
		}

		// Figure out how to handle the key now that it has been released.
		mPowerKeyPressCounter += 1;

		@@ -3362,9 +3364,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		*/
		void launchHomeFromHotKey(int displayId, final boolean awakenFromDreams,
		final boolean respectKeyguard) {
		// Abort possibly stuck animations.
		mHandler.post(mWindowManagerFuncs::triggerAnimationFailsafe);

		if (respectKeyguard) {
		if (isKeyguardShowingAndNotOccluded()) {
		// don't launch home if keyguard showing