Merge "Ensure settings maintains its Bluetooth device inquiry state" am: bec574dca7 am: 3b68dd138c am: aa8275f8d3

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

Change-Id: I24132ac6bb13b471091c91b7dc04edf09ea4ba37

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