Merge "Bluetooth: preserve one advertisement slot for GMS core" am: 00cc1847d3

am: 922ae0237f Change-Id: Ifd790251d6531d3556af7b470e681f06f3e25070
2018-03-16 01:30:30 +00:00
parent 20cd66a16d 922ae0237f
commit 158344f78a
1 changed files with 4 additions and 0 deletions
--- a/core/java/android/bluetooth/BluetoothAdapter.java
+++ b/core/java/android/bluetooth/BluetoothAdapter.java
@@ -680,6 +680,10 @@ public final class BluetoothAdapter {
        if (!getLeAccess()) {
            return null;
        }
+        if (!isMultipleAdvertisementSupported()) {
+            Log.e(TAG, "Bluetooth LE advertising not supported");
+            return null;
+        }
        synchronized (mLock) {
            if (sBluetoothLeAdvertiser == null) {
                sBluetoothLeAdvertiser = new BluetoothLeAdvertiser(mManagerService);