From bec3144c1133e2c45696a2ebbe8f627c395512e9 Mon Sep 17 00:00:00 2001 From: Weng Su Date: Mon, 22 Mar 2021 22:27:47 +0800 Subject: [PATCH] [Provider Model] Bring back the "turn on Wi-Fi automatically" option - Screenshot: https://screenshot.googleplex.com/92uXX6KQCqWxvub Bug: 182620666 Test: manual test make RunSettingsRoboTests ROBOTEST_FILTER=WifiWakeupPreferenceControllerTest Change-Id: Ic0ce47a6d9a374fce9752d67a9c2d083486b9083 --- .../settings/wifi/WifiWakeupPreferenceController.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java index 58697050375..e9fd35004da 100644 --- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java +++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java @@ -26,7 +26,6 @@ import android.content.IntentFilter; import android.location.LocationManager; import android.net.wifi.WifiManager; import android.provider.Settings; -import android.util.FeatureFlagUtils; import androidx.annotation.VisibleForTesting; import androidx.fragment.app.Fragment; @@ -45,7 +44,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume; * {@link TogglePreferenceController} that controls whether the Wi-Fi Wakeup feature should be * enabled. */ -// TODO(b/167474581): Should clean up this controller when Provider Model finished. public class WifiWakeupPreferenceController extends TogglePreferenceController implements LifecycleObserver, OnPause, OnResume { @@ -91,9 +89,6 @@ public class WifiWakeupPreferenceController extends TogglePreferenceController i @Override public int getAvailabilityStatus() { - if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) { - return CONDITIONALLY_UNAVAILABLE; - } return AVAILABLE; }