commit 81160605701126129c4dbbe26b3ec2a48bd26e0f
author Pavlin Radoslavov <pavlin@google.com> Wed Jan 11 06:34:10 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 11 06:34:10 2017 +0000
tree 06ea5b6358b342acd2d862e3ffbf11a1fb0a1b71
parent c3b80d6a005544e039056a5caf6d40c9a86590d1
parent 0cc9fd4b82da4327fb71f24a7f21a92e06ed67e5

Merge "Moved the Bluetooth-related default config init within onCreate()" am: ab9e269d06 am: 6e154cfb98 am: 216dcdc9dc
am: 0cc9fd4b82

Change-Id: I0da9a9c515e6ae23b5449d4b53b6268ce5beaece

src/com/android/settings/DevelopmentSettings.java

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 418c1e2..49eb1b0 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -492,6 +492,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);
@@ -699,7 +700,6 @@
             updateUsbConfigurationValues();
         }
 
-        initBluetoothConfigurationValues();
         BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
         if (adapter != null) {
             adapter.getProfileProxy(getActivity(),