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

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