Merge "Show LE audio toggle summary as default connection is classic" into main

This commit is contained in:
Alice Kuo
2023-11-14 05:10:11 +00:00
committed by Android (Google) Code Review

View File

@@ -126,9 +126,12 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll
pref.setOnPreferenceClickListener(this); pref.setOnPreferenceClickListener(this);
pref.setOrder(profile.getOrdinal()); pref.setOrder(profile.getOrdinal());
if (profile instanceof LeAudioProfile && !isModelNameInAllowList( boolean isLeEnabledByDefault =
SystemProperties.getBoolean(LE_AUDIO_CONNECTION_BY_DEFAULT_PROPERTY, true);
if (profile instanceof LeAudioProfile && (!isLeEnabledByDefault || !isModelNameInAllowList(
BluetoothUtils.getStringMetaData(mCachedDevice.getDevice(), BluetoothUtils.getStringMetaData(mCachedDevice.getDevice(),
METADATA_MODEL_NAME))) { METADATA_MODEL_NAME)))) {
pref.setSummary(R.string.device_details_leaudio_toggle_summary); pref.setSummary(R.string.device_details_leaudio_toggle_summary);
} }
return pref; return pref;