From bb1174de5e9406318224d090e05d33e930cc3ea3 Mon Sep 17 00:00:00 2001
From: Ajay Panicker <apanicke@google.com>
Date: Wed, 22 Mar 2017 17:43:51 -0700
Subject: [PATCH] Add default value to Bluetooth AVRCP version property get

When the property isn't set a crash can occur since we try to look up an
empty property value.

Bug: 36531010
Test: Open Developer options after a factory reset
Change-Id: I82c0fde00774ab1a4f3e4c44a715c74d4a7804e9
---
 src/com/android/settings/development/DevelopmentSettings.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/development/DevelopmentSettings.java b/src/com/android/settings/development/DevelopmentSettings.java
index deb4e42fe33..da6e800e4a9 100644
--- a/src/com/android/settings/development/DevelopmentSettings.java
+++ b/src/com/android/settings/development/DevelopmentSettings.java
@@ -1794,7 +1794,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
         // 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]);