Merge "Restart subsystem API: remove bug report generation argument" into sc-dev

This commit is contained in:
Etan Cohen
2021-03-24 13:25:45 +00:00
committed by Android (Google) Code Review

View File

@@ -250,6 +250,7 @@ public class ConnectivitySubsystemsRecoveryManager {
* @param callback Callbacks triggered when recovery status changes. * @param callback Callbacks triggered when recovery status changes.
*/ */
public void triggerSubsystemRestart(String reason, @NonNull RecoveryStatusCallback callback) { public void triggerSubsystemRestart(String reason, @NonNull RecoveryStatusCallback callback) {
// TODO: b/183530649 : clean-up or make use of the `reason` argument
mHandler.post(() -> { mHandler.post(() -> {
boolean someSubsystemRestarted = false; boolean someSubsystemRestarted = false;
@@ -264,7 +265,7 @@ public class ConnectivitySubsystemsRecoveryManager {
} }
if (isWifiEnabled()) { if (isWifiEnabled()) {
mWifiManager.restartWifiSubsystem(reason); mWifiManager.restartWifiSubsystem();
mWifiRestartInProgress = true; mWifiRestartInProgress = true;
someSubsystemRestarted = true; someSubsystemRestarted = true;
startTrackingWifiRestart(); startTrackingWifiRestart();