Adapter: Lock before cleaning

mLock is used for creating mBluetoothLeAdvertiser and
mBluetoothLeScanner. It must be used at cleanup too.

Test: atest FrameworkBluetoothTests
Test: atest ServiceBluetoothTests
Bug: 291815510
Change-Id: Ib94827b0aa70d293ea98779e8e30f15aff92699b

parent 4b7bbcf6

framework/java/android/bluetooth/BluetoothAdapter.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -3857,12 +3857,14 @@ public final class BluetoothAdapter {
		try {
		mService = null;
		mLeScanClients.clear();
		synchronized (mLock) {
		if (mBluetoothLeAdvertiser != null) {
		mBluetoothLeAdvertiser.cleanup();
		}
		if (mBluetoothLeScanner != null) {
		mBluetoothLeScanner.cleanup();
		}
		}
		} finally {
		mServiceLock.writeLock().unlock();
		}