LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[nearby][clean up] Remove useless legacy code

Browse Source 
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
This commit is contained in:
Xinyi Zhou
2023-12-12 19:52:00 +00:00
committed by Android Build Cherrypicker Worker
parent d9da74a98e
commit 64cbadfad9
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nearby/service/java/com/android/server/nearby/provider/BleDiscoveryProvider.java
View File

@@ -68,15 +68,6 @@ public class BleDiscoveryProvider extends AbstractDiscoveryProvider {
@GuardedBy("mLock") @GuardedBy("mLock")
@Nullable @Nullable
private List<android.nearby.ScanFilter> mScanFilters; 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 = private android.bluetooth.le.ScanCallback mScanCallback =
new android.bluetooth.le.ScanCallback() { new android.bluetooth.le.ScanCallback() {
@Override @Override
@@ -170,7 +161,6 @@ public class BleDiscoveryProvider extends AbstractDiscoveryProvider {
if (isBleAvailable()) { if (isBleAvailable()) {
Log.d(TAG, "BleDiscoveryProvider started"); Log.d(TAG, "BleDiscoveryProvider started");
startScan(getScanFilters(), getScanSettings(/* legacy= */ false), mScanCallback); startScan(getScanFilters(), getScanSettings(/* legacy= */ false), mScanCallback);
startScan(getScanFilters(), getScanSettings(/* legacy= */ true), mScanCallbackLegacy);
return; return;
} }
Log.w(TAG, "Cannot start BleDiscoveryProvider because Ble is not available."); 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."); Log.v(TAG, "Ble scan stopped.");
bluetoothLeScanner.stopScan(mScanCallback); bluetoothLeScanner.stopScan(mScanCallback);
bluetoothLeScanner.stopScan(mScanCallbackLegacy);
synchronized (mLock) { synchronized (mLock) {
if (mScanFilters != null) { if (mScanFilters != null) {
mScanFilters = null; mScanFilters = null;