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

Commit 082f92d4 authored by Zach Johnson's avatar Zach Johnson Committed by android-build-merger
Browse files

Merge "Revert "Bluetooth: preserve one advertisement slot for GMS core"" into pi-dev 

am: 59a6fccc

Change-Id: I195b1f1da0cd8e94fe1f575cae1c1b052d46ed4a
parents fae6bc25 59a6fccc

framework/java/android/bluetooth/BluetoothAdapter.java

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