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

Commit 61c0fc41 authored by Matthew Xie's avatar Matthew Xie Committed by Jason Simmons
Browse files

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
parent 8f267c4a

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

        }