From 0d8a53fa0c14090b61d8d5aa9ac9b8ccd125c613 Mon Sep 17 00:00:00 2001
From: Weng Su <wengsu@google.com>
Date: Tue, 9 Nov 2021 20:55:27 +0800
Subject: [PATCH] [Provider Model] Fixed Internet Settings always showing
 "Loading"

- The Internet Settings will restart itself if it's launching in lock
screen

- The "Loading" might not be hidden if the activity restarts itself

- Move the postDelayed runnable from onViewCreated() to onStart() to
avoid loss

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

Change-Id: I516f1105c74b6c8853a72e71c20d2197495cc0d6
---
 .../android/settings/network/NetworkProviderSettings.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java
index 349bb826097..0dd5054af76 100644
--- a/src/com/android/settings/network/NetworkProviderSettings.java
+++ b/src/com/android/settings/network/NetworkProviderSettings.java
@@ -272,8 +272,6 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
         if (mWifiManager != null) {
             setLoading(true, false);
             mIsViewLoading = true;
-            getView().postDelayed(mRemoveLoadingRunnable,
-                    mWifiManager.isWifiEnabled() ? 1000 : 100);
         }
     }
 
@@ -431,6 +429,10 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
     @Override
     public void onStart() {
         super.onStart();
+        if (mIsViewLoading) {
+            final long delayMillis = mWifiManager.isWifiEnabled() ? 1000 : 100;
+            getView().postDelayed(mRemoveLoadingRunnable, delayMillis);
+        }
         if (mIsRestricted) {
             restrictUi();
             return;