From 01d7b61ea3d01562d34f1fe35b069c6ed59fa3f2 Mon Sep 17 00:00:00 2001
From: Sergio Villar Senin <svillar@igalia.com>
Date: Wed, 2 Oct 2024 18:42:16 +0200
Subject: [PATCH] [Meta] Remove specific code for handling volume keys

Meta flavour has specific code for handling volume keys. This seems
to be legacy code from FxR. It isn't really needed as they work
fine without any special treatment. What's more, volume slider
used to dissapear under some circumstances in the past. I could
not reproduce that behaviour any more after applying this patch.
---
 .../com/igalia/wolvic/VRBrowserActivity.java  | 44 -------------------
 1 file changed, 44 deletions(-)

diff --git a/app/src/common/shared/com/igalia/wolvic/VRBrowserActivity.java b/app/src/common/shared/com/igalia/wolvic/VRBrowserActivity.java
index 3e312c2192..623badd52e 100644
--- a/app/src/common/shared/com/igalia/wolvic/VRBrowserActivity.java
+++ b/app/src/common/shared/com/igalia/wolvic/VRBrowserActivity.java
@@ -19,7 +19,6 @@
 import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.SurfaceTexture;
-import android.media.AudioManager;
 import android.net.Uri;
 import android.opengl.GLES11Ext;
 import android.opengl.GLES20;
@@ -229,7 +228,6 @@ public void run() {
     private SettingsStore mSettings;
     private SharedPreferences mPrefs;
     private boolean mConnectionAvailable = true;
-    private AudioManager mAudioManager;
     private Widget mActiveDialog;
     private Set<String> mPoorPerformanceAllowList;
     private float mCurrentCylinderDensity = 0;
@@ -249,21 +247,6 @@ public void run() {
     private int mLastMotionEventWidgetHandle;
     private boolean mIsEyeTrackingSupported;
 
-    private boolean callOnAudioManager(Consumer<AudioManager> fn) {
-        if (mAudioManager == null) {
-            mAudioManager = (AudioManager)getSystemService(Context.AUDIO_SERVICE);
-        }
-        if (mAudioManager != null) {
-            try {
-                fn.accept(mAudioManager);
-                return true;
-            } catch (Exception e) {
-                Log.e(LOGTAG, "Caught exception calling AudioManager: " + e.toString());
-            }
-        }
-        return false;
-    }
-
     private ViewTreeObserver.OnGlobalFocusChangeListener globalFocusListener = new ViewTreeObserver.OnGlobalFocusChangeListener() {
         @Override
         public void onGlobalFocusChanged(View oldFocus, View newFocus) {
@@ -1025,33 +1008,6 @@ public boolean dispatchKeyEvent(KeyEvent event) {
         if (isNotSpecialKey(event) && mKeyboard.dispatchKeyEvent(event)) {
             return true;
         }
-        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);
-            }
-            boolean result;
-            switch (keyCode) {
-                case KeyEvent.KEYCODE_VOLUME_UP:
-                    result = callOnAudioManager((AudioManager aManager) -> aManager.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_RAISE, AudioManager.FLAG_SHOW_UI));
-                    break;
-                case KeyEvent.KEYCODE_VOLUME_DOWN:
-                    result = callOnAudioManager((AudioManager aManager) -> aManager.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_LOWER, AudioManager.FLAG_SHOW_UI));
-                    break;
-                case KeyEvent.KEYCODE_VOLUME_MUTE:
-                    result = callOnAudioManager((AudioManager aManager) -> aManager.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_MUTE, AudioManager.FLAG_SHOW_UI));
-                    break;
-                default:
-                    return super.dispatchKeyEvent(event);
-            }
-            return result || super.dispatchKeyEvent(event);
-
-        }
         return super.dispatchKeyEvent(event);
     }