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

am: cff1ab6210

Change-Id: I70d52a26c838ae672763704b0ebd58f29a77dcca
This commit is contained in:
Jakub Pawlowski
2018-08-09 02:00:56 -07:00
committed by android-build-merger

View File

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