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 am: 64cbadfad9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2871217

Change-Id: I25c128df1545c26ed1760e4386cdd3eae346b45e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Xinyi Zhou
2023-12-13 20:42:38 +00:00
committed by Automerger Merge Worker
parent c6c450345c 64cbadfad9
commit 222b9b4316
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;