From 64cbadfad94d247d670b96913d0cbd3215491011 Mon Sep 17 00:00:00 2001 From: Xinyi Zhou Date: Tue, 12 Dec 2023 19:52:00 +0000 Subject: [PATCH] [nearby][clean up] Remove useless legacy code This was used back when Bluetooth 4.2 was used. We should remove the empty code here. Test: -m Ignore-AOSP-First: nearby not in aosp yet (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d671163a9a5d5d6cb8392fad08143c81b8ad5e0b) Merged-In: I0ea54f77c66c01f02fbee9eb1e782a3a9ade6566 Change-Id: I0ea54f77c66c01f02fbee9eb1e782a3a9ade6566 --- .../server/nearby/provider/BleDiscoveryProvider.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/nearby/service/java/com/android/server/nearby/provider/BleDiscoveryProvider.java b/nearby/service/java/com/android/server/nearby/provider/BleDiscoveryProvider.java index 9dd07a4d9f..e4651b791b 100644 --- a/nearby/service/java/com/android/server/nearby/provider/BleDiscoveryProvider.java +++ b/nearby/service/java/com/android/server/nearby/provider/BleDiscoveryProvider.java @@ -68,15 +68,6 @@ public class BleDiscoveryProvider extends AbstractDiscoveryProvider { @GuardedBy("mLock") @Nullable private List mScanFilters; - private android.bluetooth.le.ScanCallback mScanCallbackLegacy = - new android.bluetooth.le.ScanCallback() { - @Override - public void onScanResult(int callbackType, ScanResult scanResult) { - } - @Override - public void onScanFailed(int errorCode) { - } - }; private android.bluetooth.le.ScanCallback mScanCallback = new android.bluetooth.le.ScanCallback() { @Override @@ -170,7 +161,6 @@ public class BleDiscoveryProvider extends AbstractDiscoveryProvider { if (isBleAvailable()) { Log.d(TAG, "BleDiscoveryProvider started"); startScan(getScanFilters(), getScanSettings(/* legacy= */ false), mScanCallback); - startScan(getScanFilters(), getScanSettings(/* legacy= */ true), mScanCallbackLegacy); return; } Log.w(TAG, "Cannot start BleDiscoveryProvider because Ble is not available."); @@ -187,7 +177,6 @@ public class BleDiscoveryProvider extends AbstractDiscoveryProvider { } Log.v(TAG, "Ble scan stopped."); bluetoothLeScanner.stopScan(mScanCallback); - bluetoothLeScanner.stopScan(mScanCallbackLegacy); synchronized (mLock) { if (mScanFilters != null) { mScanFilters = null;