diff options
| author | Jakub Pawlowski <jpawlowski@google.com> | 2018-08-09 00:56:52 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-09 00:56:52 -0700 |
| commit | cff1ab6210be799fb647d5cc308876a2732d07fe (patch) | |
| tree | 83f278d10736747eeed0b48f89221a92affe13dd /core/java | |
| parent | 045247ec3a0df8678971b7b7e81ce7cac2f42923 (diff) | |
| parent | 4d98474f2ace042b612a36457dc24c63e74d9bff (diff) | |
Merge "Fix NPE when starting advertising with null GATT"
am: 4d98474f2a
Change-Id: I0a90b9694682e8b09baa99882d08db5c76364a6b
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/bluetooth/le/BluetoothLeAdvertiser.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java b/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java index 0fb4ba1a8765..13c5ff690973 100644 --- a/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java +++ b/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java @@ -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; |