Merge "Add default value to Bluetooth AVRCP version property get"
am: 84cf0b2a4b

Change-Id: I21a5388ee633edb4f7b59a61390b71ea59df7205
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 31c804d..5958f7b 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -1789,7 +1789,7 @@
         // Init the AVRCP Version - Default
         values = getResources().getStringArray(R.array.bluetooth_avrcp_version_values);
         summaries = getResources().getStringArray(R.array.bluetooth_avrcp_versions);
-        String value = SystemProperties.get(BLUETOOTH_AVRCP_VERSION_PROPERTY);
+        String value = SystemProperties.get(BLUETOOTH_AVRCP_VERSION_PROPERTY, values[0]);
         index = mBluetoothSelectAvrcpVersion.findIndexOfValue(value);
         mBluetoothSelectAvrcpVersion.setValue(values[index]);
         mBluetoothSelectAvrcpVersion.setSummary(summaries[index]);