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

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

Merge "Moved the Bluetooth-related default config init within onCreate()" am:... 

Merge "Moved the Bluetooth-related default config init within onCreate()" am: ab9e269d am: 6e154cfb am: 216dcdc9
am: 0cc9fd4b

Change-Id: I0da9a9c515e6ae23b5449d4b53b6268ce5beaece
parents c3b80d6a 0cc9fd4b

src/com/android/settings/DevelopmentSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -492,6 +492,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
        mBluetoothSelectA2dpBitsPerSample = addListPreference(BLUETOOTH_SELECT_A2DP_BITS_PER_SAMPLE_KEY);

        mBluetoothSelectA2dpChannelMode = addListPreference(BLUETOOTH_SELECT_A2DP_CHANNEL_MODE_KEY);

        mBluetoothSelectA2dpLdacPlaybackQuality = addListPreference(BLUETOOTH_SELECT_A2DP_LDAC_PLAYBACK_QUALITY_KEY);

        initBluetoothConfigurationValues();



        mWindowAnimationScale = addListPreference(WINDOW_ANIMATION_SCALE_KEY);

        mTransitionAnimationScale = addListPreference(TRANSITION_ANIMATION_SCALE_KEY);
@@ -699,7 +700,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
            updateUsbConfigurationValues();

        }



        initBluetoothConfigurationValues();

        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();

        if (adapter != null) {

            adapter.getProfileProxy(getActivity(),