diff options
| -rwxr-xr-x | core/java/android/server/BluetoothService.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java index 850349b205f6..36c01893c4c2 100755 --- 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); } |