From 0f3f6086e919e85292668ecf430604173f08a2cc Mon Sep 17 00:00:00 2001
From: SongFerngWang <songferngwang@google.com>
Date: Tue, 30 May 2023 15:18:28 +0800
Subject: [PATCH] Try to avoid the timing UI issue

Tester exit network scan interface and then enter network scan activity
immediately. The previous network scan stop command effect the current
network scan.

Move "stop network scan" to first at onStop.

Bug: 276679520
Test: Build pass.
Change-Id: Ib0125c3745537a82b7574a8580d2a02c4e3644a0
---
 .../settings/network/telephony/NetworkSelectSettings.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index b26e7835754..ebc3ea6e226 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -228,10 +228,10 @@ public class NetworkSelectSettings extends DashboardFragment {
 
     @Override
     public void onStop() {
-        super.onStop();
         if (mWaitingForNumberOfScanResults <= 0) {
             stopNetworkQuery();
         }
+        super.onStop();
     }
 
     @Override