DO NOT MERGE - cherry pick a Bluetooth property fix from master

Check nullpointer of discoverableTimeout in initBluetoothAfterTurningOn.

When we fail to get the property, print out warning message, turn
Discoverable off.
Bug 6302990

Change-Id: Ie21aa2a89050c74d99d9ee521a95ffa822114757

diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java
index dce31db..444567d 100755 (executable)
--- a/core/java/android/server/BluetoothService.java
+++ b/core/java/android/server/BluetoothService.java
@@ -611,6 +611,11 @@ public class BluetoothService extends IBluetooth.Stub {
     /*package*/ void initBluetoothAfterTurningOn() {
         String discoverable = getProperty("Discoverable", false);
         String timeout = getProperty("DiscoverableTimeout", false);
+        if (timeout == null) {
+            Log.w(TAG, "Null DiscoverableTimeout property");
+            // assign a number, anything not 0
+            timeout = "1";
+        }
         if (discoverable.equals("true") && Integer.valueOf(timeout) != 0) {
             setAdapterPropertyBooleanNative("Discoverable", 0);
         }