commit 451ac6e9fc9ab3a7a7d8bceabad88a792498064b
author SamarV-121 <samar@samarv121.dev> Fri Jun 21 07:18:32 2024 +0530
committer SamarV-121 <samar@samarv121.dev> Fri Jun 21 07:19:25 2024 +0530
tree 466faea465a8f79d3a7ce3dfe63e2550cea5797e
parent 58a1f157285c379b5f8df07c31346c4257e90c0d

Revert "VolumeDialogImpl: Handle cases where media controller is not available"

Dosen't seem to be needed on QPR3

This reverts commit 01fc4ce8e77eb32019cf5e0c42d3943e2d5b3451.

Change-Id: I1d8d0ff1126dba29ebeb6a36e4e9981af3ec58e1

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
index 8e38727..29a2c39 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
@@ -123,7 +123,6 @@
 import com.android.internal.jank.InteractionJankMonitor;
 import com.android.internal.view.RotationPolicy;
 import com.android.settingslib.Utils;
-import com.android.settingslib.media.flags.Flags;
 import com.android.systemui.Dumpable;
 import com.android.systemui.Prefs;
 import com.android.systemui.dump.DumpManager;
@@ -1398,16 +1397,15 @@
         }
         if (mSettingsView != null) {
             mSettingsView.setVisibility(
-                    mDeviceProvisionedController.isCurrentUserSetup()
-                            && (isMediaControllerAvailable()
-                                || (Flags.useMediaRouter2ForInfoMediaManager() && isBluetoothA2dpConnected()))
-                            && lockTaskModeState == LOCK_TASK_MODE_NONE ? VISIBLE : GONE);
+                    mDeviceProvisionedController.isCurrentUserSetup() &&
+                            (isMediaControllerAvailable() || isBluetoothA2dpConnected()) &&
+                            lockTaskModeState == LOCK_TASK_MODE_NONE ? VISIBLE : GONE);
         }
         if (mSettingsIcon != null) {
             mSettingsIcon.setOnClickListener(v -> {
                 Events.writeEvent(Events.EVENT_SETTINGS_CLICK);
                 String packageName = isMediaControllerAvailable()
-                        ? getActiveLocalMediaController().getPackageName() : null;
+                        ? getActiveLocalMediaController().getPackageName() : "";
                 mMediaOutputDialogFactory.create(packageName, true, mDialogView);
                 dismissH(DISMISS_REASON_SETTINGS_CLICKED);
             });