commit 4d98474f2ace042b612a36457dc24c63e74d9bff
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 09 06:48:17 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 09 06:48:17 2018 +0000
tree 6cdd5ba5c963a31a01403003fa2c9c5eb7b87ffd
parent d5eff002eb7358342381321d67e988ed6088eba8
parent 1f014f40103afa455dcc93a6de98127e0a8abb4b

Merge "Fix NPE when starting advertising with null GATT"

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

diff --git a/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java b/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java
index 0fb4ba1..13c5ff6 100644
--- a/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java
+++ b/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java
@@ -411,7 +411,14 @@
         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;