Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e205be9b authored by wengsu's avatar wengsu
Browse files

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
parent 7c7e0d4d

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

+1 −12
Original line number Diff line number Diff line
@@ -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];