Merge "Add a loading progress timeout mechanism to Internet Settings" into sc-dev

2021-06-18 08:08:19 +00:00
parent 4dc80769d5 98cf86b367
commit 0781c52dfe
1 changed files with 2 additions and 3 deletions
--- 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);
        }
    }