From b567ff7c40ae3519d7b5e883d7a502b295ca1adc Mon Sep 17 00:00:00 2001
From: Evan Chen <evanxinchen@google.com>
Date: Fri, 22 Apr 2022 16:13:53 -0700
Subject: [PATCH] Fix spinner not shows up

Issue: We reset the deviceList when onCreate in discoveryService
But when user cancel the action, and re-associate, onCreate in
activty is happend before onCreate discoveryService.

How to fix: Reset the deviceList when onDestroy in discoveryService
to make sure to have a fresh start when user re-associate.

Test: atest CtsCompanionDeviceManagerCoreTestCases
      atest CtsCompanionDeviceManagerUiAutomationTestCases
      atest CtsOsTestCases:CompanionDeviceManagerTest
Fix: 230142340
Change-Id: Idb4fff71f2ef58609e81e77fc3a2e9034c9003ae
---
 .../CompanionDeviceDiscoveryService.java                      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java
index e8a1a5cc19162..f333b86d4d525 100644
--- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java
+++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java
@@ -150,8 +150,6 @@ public class CompanionDeviceDiscoveryService extends Service {
         mBtAdapter = mBtManager.getAdapter();
         mBleScanner = mBtAdapter.getBluetoothLeScanner();
         mWifiManager = getSystemService(WifiManager.class);
-
-        sScanResultsLiveData.setValue(Collections.emptyList());
     }
 
     @Override
@@ -175,6 +173,7 @@ public class CompanionDeviceDiscoveryService extends Service {
 
     @Override
     public void onDestroy() {
+        sScanResultsLiveData.setValue(Collections.emptyList());
         super.onDestroy();
         if (DEBUG) Log.d(TAG, "onDestroy()");
     }
@@ -188,6 +187,7 @@ public class CompanionDeviceDiscoveryService extends Service {
         mStopAfterFirstMatch = request.isSingleDevice();
         mDiscoveryStarted = true;
         sStateLiveData.setValue(DiscoveryState.DISCOVERY_IN_PROGRESS);
+        sScanResultsLiveData.setValue(Collections.emptyList());
 
         final List<DeviceFilter<?>> allFilters = request.getDeviceFilters();
         final List<BluetoothDeviceFilter> btFilters =