commit 64cbadfad94d247d670b96913d0cbd3215491011
author Xinyi Zhou <zxy@google.com> Tue Dec 12 19:52:00 2023 +0000
committer Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Wed Dec 13 05:17:44 2023 +0000
tree 703f524c5b0ab71f817587e6861cf7dd39c729b6
parent d9da74a98ea3a1206066c16f4d6ef03e6d1c5cba

[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

nearby/service/java/com/android/server/nearby/provider/BleDiscoveryProvider.java

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 9dd07a4..e4651b7 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 @@
     @GuardedBy("mLock")
     @Nullable
     private List<android.nearby.ScanFilter> 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 @@
         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 @@
         }
         Log.v(TAG, "Ble scan stopped.");
         bluetoothLeScanner.stopScan(mScanCallback);
-        bluetoothLeScanner.stopScan(mScanCallbackLegacy);
         synchronized (mLock) {
             if (mScanFilters != null) {
                 mScanFilters = null;