From ce1486b2f543cf52883172c0dd74bcddb9f8f786 Mon Sep 17 00:00:00 2001
From: "Randall E. Barker" <simstorm@mac.com>
Date: Thu, 9 Jan 2020 06:38:10 -0800
Subject: [PATCH] Prevent alt+space from crashing. Fixes #2580 (#2593)

---
 .../shared/org/mozilla/vrbrowser/VRBrowserActivity.java       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java
index 0ea509d58..b097ba535 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java
@@ -649,6 +649,10 @@ public boolean dispatchKeyEvent(KeyEvent event) {
         }
         final int keyCode = event.getKeyCode();
         if (DeviceType.isOculusBuild()) {
+            if (event.getKeyCode() == KeyEvent.KEYCODE_SEARCH) {
+                // Eat search key, otherwise it causes a crash on Oculus
+                return true;
+            }
             int action = event.getAction();
             if (action != KeyEvent.ACTION_DOWN) {
                 return super.dispatchKeyEvent(event);