commit 2b80334b41f6f4269ffbb4493871ce77f4434fd4
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jan 22 18:23:15 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 22 18:23:15 2019 +0000
tree 7cdc255364bad932cf7b6015045418d08de35a31
parent d3be36300412302c910e24c7622d0ab74d731eaa
parent e205be9bd044dcc7930167b9cf8160f850fd38a1

Merge "Clean up updateState()"

src/com/android/settings/sound/MediaOutputPreferenceController.java

diff --git a/src/com/android/settings/sound/MediaOutputPreferenceController.java b/src/com/android/settings/sound/MediaOutputPreferenceController.java
index 2ac460c..ce476ad 100644
--- a/src/com/android/settings/sound/MediaOutputPreferenceController.java
+++ b/src/com/android/settings/sound/MediaOutputPreferenceController.java
@@ -74,18 +74,7 @@
         }
 
         final int numDevices = mConnectedDevices.size();
-        if (numDevices == 0) {
-            // Disable switch entry if there is no connected devices.
-            mPreference.setVisible(false);
-            final CharSequence summary = mContext.getText(R.string.media_output_default_summary);
-            final CharSequence[] defaultMediaOutput = new CharSequence[]{summary};
-            mSelectedIndex = getDefaultDeviceIndex();
-            preference.setSummary(summary);
-            setPreference(defaultMediaOutput, defaultMediaOutput, preference);
-            return;
-        }
-
-        mPreference.setVisible(true);
+        mPreference.setVisible((numDevices == 0) ? false : true);
         CharSequence[] mediaOutputs = new CharSequence[numDevices + 1];
         CharSequence[] mediaValues = new CharSequence[numDevices + 1];