Merge remote-tracking branch 'origin/lineage-18.1' into v1-r (82a2c55d) · Commits · e / os / android_frameworks_base

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -1024,7 +1024,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		// Reset back key state for long press
		mBackKeyHandled = false;

		if (hasLongPressOnBackBehavior()) {
		if (hasLongPressOnBackBehavior() && !mHandler.hasMessages(MSG_BACK_LONG_PRESS)) {
		Message msg = mHandler.obtainMessage(MSG_BACK_LONG_PRESS, event);
		msg.setAsynchronous(true);
		mHandler.sendMessageDelayed(msg,
		@@ -4280,6 +4280,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {

		if (down) {
		interceptBackKeyDown(event);

		// Don't pass repeated events to app if user has custom long press action
		// set up in settings
		if (event.getRepeatCount() > 0 && hasLongPressOnBackBehavior()) {
		result &= ~ACTION_PASS_TO_USER;
		}
		} else {
		boolean handled = interceptBackKeyUp(event);