PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up updateState()

Browse Source 
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
This commit is contained in:
wengsu
2019-01-19 18:01:20 +08:00
parent 7c7e0d4d7d
commit e205be9bd0
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/sound/MediaOutputPreferenceController.java
View File

@@ -74,18 +74,7 @@ public class MediaOutputPreferenceController extends AudioSwitchPreferenceContro
} }
final int numDevices = mConnectedDevices.size(); final int numDevices = mConnectedDevices.size();
if (numDevices == 0) { mPreference.setVisible((numDevices == 0) ? false : true);
// 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);
CharSequence[] mediaOutputs = new CharSequence[numDevices + 1]; CharSequence[] mediaOutputs = new CharSequence[numDevices + 1];
CharSequence[] mediaValues = new CharSequence[numDevices + 1]; CharSequence[] mediaValues = new CharSequence[numDevices + 1];