commit 6e154cfb98aab585e8463107f9bab42d7fb42246
author Pavlin Radoslavov <pavlin@google.com> Wed Jan 11 06:15:39 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 11 06:15:39 2017 +0000
tree 83481acad9c28758ab0448f565d929376f0e31d6
parent a9e9bf20e8b87f42f836b2bb44cacf799d8ad910
parent ab9e269d068bd9c10b5501f26230214ae673c3cd

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

Change-Id: Ic0d0d4b6d63b25afafae35b81686e746939646fd

src/com/android/settings/DevelopmentSettings.java

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index f085ae3..b39097b 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -475,6 +475,7 @@
         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);
@@ -668,7 +669,6 @@
             updateUsbConfigurationValues();
         }
 
-        initBluetoothConfigurationValues();
         BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
         if (adapter != null) {
             adapter.getProfileProxy(getActivity(),