Donot bind to GATT service when BLE is not supported

bug 8664724

Change-Id: I9b9222cd5877babcded73798a5d1ff13fd10e791

2 files changed, 9 insertions, 1 deletions

diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java
index cfbfb48d4a1f..7ec73ef74135 100644
--- a/core/java/android/bluetooth/BluetoothAdapter.java
+++ b/core/java/android/bluetooth/BluetoothAdapter.java
@@ -1472,9 +1472,13 @@ public final class BluetoothAdapter {
 
             try {
                 IBluetoothGatt iGatt = mManagerService.getBluetoothGatt();
+                if (iGatt == null) {
+                    // BLE is not supported
+                    return false;
+                }
+
                 UUID uuid = UUID.randomUUID();
                 GattCallbackWrapper wrapper = new GattCallbackWrapper(this, callback, serviceUuids);
-
                 iGatt.registerClient(new ParcelUuid(uuid), wrapper);
                 if (wrapper.scanStarted()) {
                     mLeScanClients.put(callback, wrapper);
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java
index 3c1ec90f19c3..79a5ffea46ab 100644
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -1187,6 +1187,10 @@ public final class BluetoothDevice implements Parcelable {
         IBluetoothManager managerService = adapter.getBluetoothManager();
         try {
             IBluetoothGatt iGatt = managerService.getBluetoothGatt();
+            if (iGatt == null) {
+                // BLE is not supported
+                return null;
+            }
             BluetoothGatt gatt = new BluetoothGatt(context, iGatt, this);
             gatt.connect(autoConnect, callback);
             return gatt;