Merge "Bluetooth: preserve one advertisement slot for GMS core"

am: 00cc1847d3 Change-Id: I5a6d39107b49690e11afd8c7e394554fbf616e11
2018-03-16 01:13:07 +00:00
parent abf9a4ccbd 00cc1847d3
commit 922ae0237f
1 changed files with 4 additions and 0 deletions
--- a/core/java/android/bluetooth/BluetoothAdapter.java
+++ b/core/java/android/bluetooth/BluetoothAdapter.java
@@ -676,6 +676,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);