OSDN Git Service

Clean up updateState()
authorwengsu <wengsu@google.com>
Sat, 19 Jan 2019 10:01:20 +0000 (18:01 +0800)
committerwengsu <wengsu@google.com>
Sat, 19 Jan 2019 10:01:20 +0000 (18:01 +0800)
  1. It's to set preference always even no available Bluetooth device.
  2. Remove redundant code in if (numDevices == 0) {...} condition.

Bug: 123000252
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER=MediaOutputPreferenceControllerTest
Change-Id: I9061428375f6097fde60498bf19eae2edafa5959

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

index 2ac460c..ce476ad 100644 (file)
@@ -74,18 +74,7 @@ public class MediaOutputPreferenceController extends AudioSwitchPreferenceContro
         }
 
         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];