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

Commit d6d92e5e authored by Pavlin Radoslavov's avatar Pavlin Radoslavov Committed by android-build-merger
Browse files

Merge "Add null pointer checks when updating A2DP configuration values" am:... 

Merge "Add null pointer checks when updating A2DP configuration values" am: 6f743758 am: bd3f9670 am: fae23e1e
am: 73aa2c6b

Change-Id: Iac81cb29671c198414a53c517deb6db962294d0a
parents 1afcfa62 73aa2c6b

src/com/android/settings/DevelopmentSettings.java

+5 −5
Original line number Diff line number Diff line
@@ -1847,7 +1847,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
        default:

            break;

        }

        if (index >= 0) {

        if (index >= 0 && mBluetoothSelectA2dpCodec != null) {

            summaries = resources.getStringArray(R.array.bluetooth_a2dp_codec_summaries);

            streaming = resources.getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);

            mBluetoothSelectA2dpCodec.setSummary(streaming);
@@ -1874,7 +1874,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
        default:

            break;

        }

        if (index >= 0) {

        if (index >= 0 && mBluetoothSelectA2dpSampleRate != null) {

            summaries = resources.getStringArray(R.array.bluetooth_a2dp_codec_sample_rate_summaries);

            streaming = resources.getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);

             mBluetoothSelectA2dpSampleRate.setSummary(streaming);
@@ -1896,7 +1896,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
        default:

            break;

        }

        if (index >= 0) {

        if (index >= 0 && mBluetoothSelectA2dpBitsPerSample != null) {

            summaries = resources.getStringArray(R.array.bluetooth_a2dp_codec_bits_per_sample_summaries);

            streaming = resources.getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);

            mBluetoothSelectA2dpBitsPerSample.setSummary(streaming);
@@ -1915,7 +1915,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
        default:

            break;

        }

        if (index >= 0) {

        if (index >= 0 && mBluetoothSelectA2dpChannelMode != null) {

            summaries = resources.getStringArray(R.array.bluetooth_a2dp_codec_channel_mode_summaries);

            streaming = resources.getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);

             mBluetoothSelectA2dpChannelMode.setSummary(streaming);
@@ -1941,7 +1941,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
            index = -1;

            break;

        }

        if (index >= 0) {

        if (index >= 0 && mBluetoothSelectA2dpLdacPlaybackQuality != null) {

            summaries = resources.getStringArray(R.array.bluetooth_a2dp_codec_ldac_playback_quality_summaries);

            streaming = resources.getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);

            mBluetoothSelectA2dpLdacPlaybackQuality.setSummary(streaming);