Merge "Ensure settings maintains its Bluetooth device inquiry state" into sc-dev am: 524f4979f5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178131

Change-Id: I12026f596a32a98f8e529bd0475f02e35ed66d1a
This commit is contained in:
TreeHugger Robot
2021-07-02 23:11:35 +00:00
committed by Automerger Merge Worker

View File

@@ -229,14 +229,18 @@ public abstract class DeviceListPreferenceFragment extends
@VisibleForTesting @VisibleForTesting
void enableScanning() { void enableScanning() {
// BluetoothAdapter already handles repeated scan requests // BluetoothAdapter already handles repeated scan requests
startScanning(); if (!mScanEnabled) {
mScanEnabled = true; startScanning();
mScanEnabled = true;
}
} }
@VisibleForTesting @VisibleForTesting
void disableScanning() { void disableScanning() {
stopScanning(); if (mScanEnabled) {
mScanEnabled = false; stopScanning();
mScanEnabled = false;
}
} }
@Override @Override