Commit dedafbf4 authored Oct 19, 2023 by Jorim Jaggi Committed by Automerger Merge Worker Oct 19, 2023

Merge "Back button/gesture is not working with Android 14 easter egg...

Merge "Back button/gesture is not working with Android 14 easter egg activity." into main am: c54b01e2 am: d8696453

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2789016

Change-Id: I4649489f700947418a6b09f7e6c9f2e22811e3d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/java/com/android/internal/app/PlatLogoActivity.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -259,7 +259,7 @@ public class PlatLogoActivity extends Activity {
		}
		return true;
		}
		return false;
		return super.onKeyDown(keyCode,event);
		}

		@Override
		@@ -268,7 +268,7 @@ public class PlatLogoActivity extends Activity {
		stopWarp();
		return true;
		}
		return false;
		return super.onKeyUp(keyCode,event);
		}

		private void startWarp() {