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

Commit cff1ab62 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

Change-Id: I0a90b9694682e8b09baa99882d08db5c76364a6b
parents 045247ec 4d98474f

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;