From e205be9bd044dcc7930167b9cf8160f850fd38a1 Mon Sep 17 00:00:00 2001 From: wengsu Date: Sat, 19 Jan 2019 18:01:20 +0800 Subject: [PATCH] Clean up updateState() 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 --- .../sound/MediaOutputPreferenceController.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/com/android/settings/sound/MediaOutputPreferenceController.java b/src/com/android/settings/sound/MediaOutputPreferenceController.java index 2ac460cf61c..ce476adf289 100644 --- a/src/com/android/settings/sound/MediaOutputPreferenceController.java +++ b/src/com/android/settings/sound/MediaOutputPreferenceController.java @@ -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];