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

am: 5bdf063537

Change-Id: I195b1f1da0cd8e94fe1f575cae1c1b052d46ed4a
This commit is contained in:
Zach Johnson
2018-03-23 21:03:04 +00:00
committed by android-build-merger

View File

@@ -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);