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

Commit a23016c7 authored by Zhihai Xu's avatar Zhihai Xu Committed by Android Git Automerger
Browse files

am 9efa3b6c: Merge "NPE in BluetoothDevice.fetchUuidsWithSdp" 

* commit '9efa3b6c':
  NPE in BluetoothDevice.fetchUuidsWithSdp
parents 3c7d5846 9efa3b6c

core/java/android/bluetooth/BluetoothDevice.java

+6 −1
Original line number Diff line number Diff line
@@ -945,8 +945,13 @@ public final class BluetoothDevice implements Parcelable { 
      *               was started.

      */

     public boolean fetchUuidsWithSdp() {

        IBluetooth service = sService;

        if (service == null) {

            Log.e(TAG, "BT not enabled. Cannot fetchUuidsWithSdp");

            return false;

        }

        try {

            return sService.fetchRemoteUuids(this);

            return service.fetchRemoteUuids(this);

        } catch (RemoteException e) {Log.e(TAG, "", e);}

            return false;

    }