PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the NPE issue in the Internet Settings" into sc-dev am: 381bbbda8d am: c80050cede

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15269083

Change-Id: I94a8a696d50d1c052361c501b33e13a47832cf89
This commit is contained in:
TreeHugger Robot
2021-07-15 09:27:59 +00:00
committed by Automerger Merge Worker
parent df6423cffd c80050cede
commit c540823948
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/network/NetworkProviderSettings.java
View File

@@ -167,7 +167,8 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
}
private boolean mIsViewLoading;
private final Runnable mRemoveLoadingRunnable = () -> {
@VisibleForTesting
final Runnable mRemoveLoadingRunnable = () -> {
if (mIsViewLoading) {
setLoading(false, false);
mIsViewLoading = false;
@@ -175,11 +176,13 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
};
private boolean mIsWifiEntryListStale = true;
private final Runnable mUpdateWifiEntryPreferencesRunnable = () -> {
@VisibleForTesting
final Runnable mUpdateWifiEntryPreferencesRunnable = () -> {
updateWifiEntryPreferences();
getView().postDelayed(mRemoveLoadingRunnable, 10);
};
private final Runnable mHideProgressBarRunnable = () -> {
@VisibleForTesting
final Runnable mHideProgressBarRunnable = () -> {
setProgressBarVisible(false);
};
@@ -445,6 +448,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
@Override
public void onStop() {
mIsWifiEntryListStale = true;
getView().removeCallbacks(mRemoveLoadingRunnable);
getView().removeCallbacks(mUpdateWifiEntryPreferencesRunnable);
getView().removeCallbacks(mHideProgressBarRunnable);
mAirplaneModeEnabler.stop();