From 98cf86b3675e660d260ee70639f22bf490a5d8e3 Mon Sep 17 00:00:00 2001
From: Weng Su <wengsu@google.com>
Date: Fri, 18 Jun 2021 13:43:14 +0800
Subject: [PATCH] Add a loading progress timeout mechanism to Internet Settings

- The WiFi scan results may not be called back, need to add loading
progress timeout to avoid loading forever

Bug: 191336310
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I71071e7e68007cf7e16be46230eec3b01f4d2b45
---
 .../android/settings/network/NetworkProviderSettings.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java
index b34d9cd7a63..25cf4ce7dab 100644
--- a/src/com/android/settings/network/NetworkProviderSettings.java
+++ b/src/com/android/settings/network/NetworkProviderSettings.java
@@ -267,9 +267,8 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
         if (mWifiManager != null) {
             setLoading(true, false);
             mIsViewLoading = true;
-            if (!mWifiManager.isWifiEnabled()) {
-                getView().postDelayed(mRemoveLoadingRunnable, 100);
-            }
+            getView().postDelayed(mRemoveLoadingRunnable,
+                    mWifiManager.isWifiEnabled() ? 1000 : 100);
         }
     }