Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43b6fd9a authored by Matthew Xie's avatar Matthew Xie
Browse files

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
parent 63c115c4

core/java/android/server/BluetoothService.java

+5 −0
Original line number Diff line number Diff line
@@ -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);

        }