From 0b365c3e6934ce7eac28f5c4f7dc2292da6d7e50 Mon Sep 17 00:00:00 2001
From: Rahul Sabnis <rahulsabnis@google.com>
Date: Mon, 24 May 2021 18:29:05 -0700
Subject: [PATCH] Ensure settings maintains its Bluetooth device inquiry state

Bug: 187165224
Test: Manual
Merged-In: I4dafb7bf5b410d99cba7e30ee17f966611458db7
Change-Id: I4dafb7bf5b410d99cba7e30ee17f966611458db7
---
 .../bluetooth/DeviceListPreferenceFragment.java      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
index 1ad322aab97..21813099237 100644
--- 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