Merge "Bluetooth: Prevent scan start if already in progress" (d1d46061) · Commits · e / os / android_packages_apps_Bluetooth

src/com/android/bluetooth/gatt/GattService.java

+16 −2

Original line number	Diff line number	Diff line
		@@ -904,8 +904,15 @@ public class GattService extends ProfileService {
		LeScanRequestArbitrator.instance().RequestLeScan(LeScanRequestArbitrator.LE_NORMAL_SCAN_TYPE)) {
		if (DBG) Log.d(TAG, "startScan() - adding client=" + appIf);
		mScanQueue.add(new ScanClient(appIf, isServer));
		if(mScanQueue.size()==1)//start scan only if it is not already started
		{
		gattClientScanNative(appIf, true);
		}
		else
		{
		Log.d(TAG, "startScan scan already in progress for appifs-queue=" + mScanQueue.size());
		}
		}
		}

		void startScanWithUuids(int appIf, boolean isServer, UUID[] uuids) {
		@@ -917,8 +924,15 @@ public class GattService extends ProfileService {
		LeScanRequestArbitrator.instance().RequestLeScan(LeScanRequestArbitrator.LE_NORMAL_SCAN_TYPE)) {
		if (DBG) Log.d(TAG, "startScanWithUuids() - adding client=" + appIf);
		mScanQueue.add(new ScanClient(appIf, isServer, uuids));
		if(mScanQueue.size()==1)//start scan only if it is not already started
		{
		gattClientScanNative(appIf, true);
		}
		else
		{
		Log.d(TAG, "startScanWithUuids scan already in progress for appifs-queue=" + mScanQueue.size());
		}
		}
		}

		void stopScan(int appIf, boolean isServer) {