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

Commit b85a769e authored by Matthew Xie's avatar Matthew Xie Committed by Android (Google) Code Review
Browse files

Merge "Check nullpointer of discoverableTimeout in initBluetoothAfterTurningOn."

parents 3844067c 43b6fd9a

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);

        }