Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab2b3b46 authored by Miao-chen Chou's avatar Miao-chen Chou Committed by android-build-merger
Browse files

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

am: 537021c3

Change-Id: Ifd790251d6531d3556af7b470e681f06f3e25070
parents 9b464f01 537021c3

framework/java/android/bluetooth/BluetoothAdapter.java

+4 −0
Original line number Diff line number Diff line
@@ -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);