Get rid of ResultStorageDescriptor in startScan am: 5aa40b903a (9cf37f5f) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/le/BluetoothLeScanner.java

+8 −15

Original line number	Original line	Diff line number	Diff line
	@@ -144,7 +144,7 @@ public final class BluetoothLeScanner {
	@RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)		@RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
	public void startScan(List<ScanFilter> filters, ScanSettings settings,		public void startScan(List<ScanFilter> filters, ScanSettings settings,
	final ScanCallback callback) {		final ScanCallback callback) {
	startScan(filters, settings, null, callback, /callbackIntent=/ null, null);		startScan(filters, settings, null, callback, /callbackIntent=/ null);
	}		}

	/**		/**
	@@ -175,7 +175,7 @@ public final class BluetoothLeScanner {
	@NonNull PendingIntent callbackIntent) {		@NonNull PendingIntent callbackIntent) {
	return startScan(filters,		return startScan(filters,
	settings != null ? settings : new ScanSettings.Builder().build(),		settings != null ? settings : new ScanSettings.Builder().build(),
	null, null, callbackIntent, null);		null, null, callbackIntent);
	}		}

	/**		/**
	@@ -210,13 +210,12 @@ public final class BluetoothLeScanner {
	Manifest.permission.BLUETOOTH_ADMIN, Manifest.permission.UPDATE_DEVICE_STATS})		Manifest.permission.BLUETOOTH_ADMIN, Manifest.permission.UPDATE_DEVICE_STATS})
	public void startScanFromSource(List<ScanFilter> filters, ScanSettings settings,		public void startScanFromSource(List<ScanFilter> filters, ScanSettings settings,
	final WorkSource workSource, final ScanCallback callback) {		final WorkSource workSource, final ScanCallback callback) {
	startScan(filters, settings, workSource, callback, null, null);		startScan(filters, settings, workSource, callback, null);
	}		}

	private int startScan(List<ScanFilter> filters, ScanSettings settings,		private int startScan(List<ScanFilter> filters, ScanSettings settings,
	final WorkSource workSource, final ScanCallback callback,		final WorkSource workSource, final ScanCallback callback,
	final PendingIntent callbackIntent,		final PendingIntent callbackIntent) {
	List<List<ResultStorageDescriptor>> resultStorages) {
	BluetoothLeUtils.checkAdapterStateOn(mBluetoothAdapter);		BluetoothLeUtils.checkAdapterStateOn(mBluetoothAdapter);
	if (callback == null && callbackIntent == null) {		if (callback == null && callbackIntent == null) {
	throw new IllegalArgumentException("callback is null");		throw new IllegalArgumentException("callback is null");
	@@ -252,7 +251,7 @@ public final class BluetoothLeScanner {
	}		}
	if (callback != null) {		if (callback != null) {
	BleScanCallbackWrapper wrapper = new BleScanCallbackWrapper(gatt, filters,		BleScanCallbackWrapper wrapper = new BleScanCallbackWrapper(gatt, filters,
	settings, workSource, callback, resultStorages);		settings, workSource, callback);
	wrapper.startRegistration();		wrapper.startRegistration();
	} else {		} else {
	try {		try {
	@@ -335,13 +334,10 @@ public final class BluetoothLeScanner {
	final ScanCallback callback) {		final ScanCallback callback) {
	int filterSize = truncatedFilters.size();		int filterSize = truncatedFilters.size();
	List<ScanFilter> scanFilters = new ArrayList<ScanFilter>(filterSize);		List<ScanFilter> scanFilters = new ArrayList<ScanFilter>(filterSize);
	List<List<ResultStorageDescriptor>> scanStorages =
	new ArrayList<List<ResultStorageDescriptor>>(filterSize);
	for (TruncatedFilter filter : truncatedFilters) {		for (TruncatedFilter filter : truncatedFilters) {
	scanFilters.add(filter.getFilter());		scanFilters.add(filter.getFilter());
	scanStorages.add(filter.getStorageDescriptors());
	}		}
	startScan(scanFilters, settings, null, callback, null, scanStorages);		startScan(scanFilters, settings, null, callback, null);
	}		}

	/**		/**
	@@ -364,7 +360,6 @@ public final class BluetoothLeScanner {
	private final WorkSource mWorkSource;		private final WorkSource mWorkSource;
	private ScanSettings mSettings;		private ScanSettings mSettings;
	private IBluetoothGatt mBluetoothGatt;		private IBluetoothGatt mBluetoothGatt;
	private List<List<ResultStorageDescriptor>> mResultStorages;

	// mLeHandle 0: not registered		// mLeHandle 0: not registered
	// -2: registration failed because app is scanning to frequently		// -2: registration failed because app is scanning to frequently
	@@ -374,15 +369,13 @@ public final class BluetoothLeScanner {

	public BleScanCallbackWrapper(IBluetoothGatt bluetoothGatt,		public BleScanCallbackWrapper(IBluetoothGatt bluetoothGatt,
	List<ScanFilter> filters, ScanSettings settings,		List<ScanFilter> filters, ScanSettings settings,
	WorkSource workSource, ScanCallback scanCallback,		WorkSource workSource, ScanCallback scanCallback) {
	List<List<ResultStorageDescriptor>> resultStorages) {
	mBluetoothGatt = bluetoothGatt;		mBluetoothGatt = bluetoothGatt;
	mFilters = filters;		mFilters = filters;
	mSettings = settings;		mSettings = settings;
	mWorkSource = workSource;		mWorkSource = workSource;
	mScanCallback = scanCallback;		mScanCallback = scanCallback;
	mScannerId = 0;		mScannerId = 0;
	mResultStorages = resultStorages;
	}		}

	public void startRegistration() {		public void startRegistration() {
	@@ -458,7 +451,7 @@ public final class BluetoothLeScanner {
	} else {		} else {
	mScannerId = scannerId;		mScannerId = scannerId;
	mBluetoothGatt.startScan(mScannerId, mSettings, mFilters,		mBluetoothGatt.startScan(mScannerId, mSettings, mFilters,
	mResultStorages, mOpPackageName, mFeatureId);		mOpPackageName, mFeatureId);
	}		}
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, "fail to start le scan: " + e);		Log.e(TAG, "fail to start le scan: " + e);