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

Merge "[Provider Model] Hide Connectivity Subsystems when recovering" into sc-dev am: 80fd8a7cce am: 2a56929f62

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

Change-Id: I4e76656f5cfefe4dca6a432929e9c8ac756c34db
This commit is contained in:
TreeHugger Robot
2021-06-29 13:39:21 +00:00
committed by Automerger Merge Worker
parent 49ab6f7ba5 2a56929f62
commit 1d69f1c0e1
6 changed files with 609 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,9 +32,7 @@ import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.PowerManager;
import android.os.Process;
import android.provider.Settings;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
@@ -79,7 +77,6 @@ import com.android.settings.wifi.dpp.WifiDppUtils;
import com.android.settingslib.HelpUtils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.connectivity.ConnectivitySubsystemsRecoveryManager;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.search.SearchIndexable;
import com.android.settingslib.utils.ThreadUtils;
@@ -101,7 +98,6 @@ import java.util.Optional;
public class NetworkProviderSettings extends RestrictedSettingsFragment
implements Indexable, WifiPickerTracker.WifiPickerTrackerCallback,
WifiDialog2.WifiDialog2Listener, DialogInterface.OnDismissListener,
ConnectivitySubsystemsRecoveryManager.RecoveryStatusCallback,
AirplaneModeEnabler.OnAirplaneModeChangedListener, InternetUpdater.InternetChangeListener {
public static final String ACTION_NETWORK_PROVIDER_SETTINGS =
@@ -192,9 +188,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
private WifiManager.ActionListener mSaveListener;
private WifiManager.ActionListener mForgetListener;
@VisibleForTesting
protected ConnectivitySubsystemsRecoveryManager mConnectivitySubsystemsRecoveryManager;
private HandlerThread mRecoveryThread;
protected InternetResetHelper mInternetResetHelper;
/**
* The state of {@link #isUiRestricted()} at {@link #onCreate(Bundle)}}. This is necessary to
@@ -1274,39 +1268,17 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
}
private void fixConnectivity() {
if (mConnectivitySubsystemsRecoveryManager == null) {
mRecoveryThread = new HandlerThread(TAG
+ "{" + Integer.toHexString(System.identityHashCode(this)) + "}",
Process.THREAD_PRIORITY_BACKGROUND);
mRecoveryThread.start();
mConnectivitySubsystemsRecoveryManager = new ConnectivitySubsystemsRecoveryManager(
getContext(), mRecoveryThread.getThreadHandler());
}
if (mConnectivitySubsystemsRecoveryManager.isRecoveryAvailable()) {
mConnectivitySubsystemsRecoveryManager.triggerSubsystemRestart(null /* reason */, this);
}
}
/**
* Callback for the internet recovery started.
*/
public void onSubsystemRestartOperationBegin() {
if (mResetInternetPreference != null) {
mResetInternetPreference.setVisible(true);
}
updateAirplaneModeMsgPreference(false /* visible */);
}
/**
* Callback for the internet recovery ended.
*/
public void onSubsystemRestartOperationEnd() {
if (mResetInternetPreference != null) {
mResetInternetPreference.setVisible(false);
}
if (mAirplaneModeEnabler.isAirplaneModeOn()) {
updateAirplaneModeMsgPreference(true /* visible */);
if (mInternetResetHelper == null) {
mInternetResetHelper = new InternetResetHelper(getContext(), getLifecycle());
mInternetResetHelper.setResettingPreference(mResetInternetPreference);
mInternetResetHelper.setMobileNetworkController(mNetworkMobileProviderController);
mInternetResetHelper.setWifiTogglePreference(
findPreference(WifiSwitchPreferenceController.KEY));
mInternetResetHelper.addWifiNetworkPreference(mConnectedWifiEntryPreferenceCategory);
mInternetResetHelper.addWifiNetworkPreference(mFirstWifiEntryPreferenceCategory);
mInternetResetHelper.addWifiNetworkPreference(mWifiEntryPreferenceCategory);
}
mInternetResetHelper.restart();
}
/**