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

Commit 5eaffc9e authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Fix NPE when starting advertising with null GATT" am: 4d98474f 

am: cff1ab62

Change-Id: I70d52a26c838ae672763704b0ebd58f29a77dcca
parents b9edd4fb cff1ab62

core/java/android/bluetooth/le/BluetoothLeAdvertiser.java

+8 −1
Original line number Diff line number Diff line
@@ -411,7 +411,14 @@ public final class BluetoothLeAdvertiser { 
        try {

            gatt = mBluetoothManager.getBluetoothGatt();

        } catch (RemoteException e) {

            Log.e(TAG, "Failed to get Bluetooth gatt - ", e);

            Log.e(TAG, "Failed to get Bluetooth GATT - ", e);

            postStartSetFailure(handler, callback,

                    AdvertiseCallback.ADVERTISE_FAILED_INTERNAL_ERROR);

            return;

        }



        if (gatt == null) {

            Log.e(TAG, "Bluetooth GATT is null");

            postStartSetFailure(handler, callback,

                    AdvertiseCallback.ADVERTISE_FAILED_INTERNAL_ERROR);

            return;