Merge "Ensure settings maintains its Bluetooth device inquiry state" into sc-dev

2021-07-02 23:02:30 +00:00
parent 59b82fad2f 0b365c3e69
commit 524f4979f5
1 changed files with 8 additions and 4 deletions
--- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
+++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
@@ -229,14 +229,18 @@ public abstract class DeviceListPreferenceFragment extends
    @VisibleForTesting
    void enableScanning() {
        // BluetoothAdapter already handles repeated scan requests
-        startScanning();
-        mScanEnabled = true;
+        if (!mScanEnabled) {
+            startScanning();
+            mScanEnabled = true;
+        }
    }

    @VisibleForTesting
    void disableScanning() {
-        stopScanning();
-        mScanEnabled = false;
+        if (mScanEnabled) {
+            stopScanning();
+            mScanEnabled = false;
+        }
    }

    @Override