Merge "Settings: Use new API for wifi wakeup feature toggle" (93f6c463) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/wifi/WifiSettings.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -1020,8 +1020,7 @@ public class WifiSettings extends RestrictedSettingsFragment
		final Context context = getContext();
		final PowerManager powerManager = context.getSystemService(PowerManager.class);
		final ContentResolver contentResolver = context.getContentResolver();
		return Settings.Global.getInt(contentResolver,
		Settings.Global.WIFI_WAKEUP_ENABLED, 0) == 1
		return mWifiManager.isAutoWakeupEnabled()
		&& Settings.Global.getInt(contentResolver,
		Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1
		&& Settings.Global.getInt(contentResolver,

src/com/android/settings/wifi/WifiSettings2.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -851,8 +851,7 @@ public class WifiSettings2 extends RestrictedSettingsFragment
		final Context context = getContext();
		final PowerManager powerManager = context.getSystemService(PowerManager.class);
		final ContentResolver contentResolver = context.getContentResolver();
		return Settings.Global.getInt(contentResolver,
		Settings.Global.WIFI_WAKEUP_ENABLED, 0) == 1
		return mWifiManager.isAutoWakeupEnabled()
		&& Settings.Global.getInt(contentResolver,
		Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1
		&& Settings.Global.getInt(contentResolver,

src/com/android/settings/wifi/WifiWakeupPreferenceController.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.location.LocationManager;
		import android.net.wifi.WifiManager;
		import android.provider.Settings;

		import androidx.annotation.VisibleForTesting;
		@@ -57,6 +58,9 @@ public class WifiWakeupPreferenceController extends TogglePreferenceController i
		@VisibleForTesting
		LocationManager mLocationManager;

		@VisibleForTesting
		WifiManager mWifiManager;

		private final BroadcastReceiver mLocationReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		@@ -70,6 +74,7 @@ public class WifiWakeupPreferenceController extends TogglePreferenceController i
		public WifiWakeupPreferenceController(Context context) {
		super(context, KEY_ENABLE_WIFI_WAKEUP);
		mLocationManager = (LocationManager) context.getSystemService(Service.LOCATION_SERVICE);
		mWifiManager = context.getSystemService(WifiManager.class);
		}

		public void setFragment(Fragment hostFragment) {
		@@ -160,13 +165,11 @@ public class WifiWakeupPreferenceController extends TogglePreferenceController i
		}

		private boolean getWifiWakeupEnabled() {
		return Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.WIFI_WAKEUP_ENABLED, 0) == 1;
		return mWifiManager.isAutoWakeupEnabled();
		}

		private void setWifiWakeupEnabled(boolean enabled) {
		Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WIFI_WAKEUP_ENABLED,
		enabled ? 1 : 0);
		mWifiManager.setAutoWakeupEnabled(enabled);
		}

		@Override

tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import android.content.ContentResolver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.res.Resources;
		import android.net.wifi.WifiManager;
		import android.os.Bundle;
		import android.os.PowerManager;
		import android.os.UserManager;
		@@ -71,6 +72,8 @@ public class WifiSettings2Test {
		@Mock
		private PowerManager mPowerManager;
		@Mock
		private WifiManager mWifiManager;
		@Mock
		private DataUsagePreference mDataUsagePreference;
		private Context mContext;
		private WifiSettings2 mWifiSettings2;
		@@ -85,10 +88,12 @@ public class WifiSettings2Test {
		mWifiSettings2 = spy(new WifiSettings2());
		doReturn(mContext).when(mWifiSettings2).getContext();
		doReturn(mPowerManager).when(mContext).getSystemService(PowerManager.class);
		doReturn(mWifiManager).when(mContext).getSystemService(WifiManager.class);
		mWifiSettings2.mAddWifiNetworkPreference = new AddWifiNetworkPreference(mContext);
		mWifiSettings2.mSavedNetworksPreference = new Preference(mContext);
		mWifiSettings2.mConfigureWifiSettingsPreference = new Preference(mContext);
		mWifiSettings2.mWifiPickerTracker = mMockWifiPickerTracker;
		mWifiSettings2.mWifiManager = mWifiManager;
		}

		@Test
		@@ -157,7 +162,7 @@ public class WifiSettings2Test {
		@Test
		public void setAdditionalSettingsSummaries_wifiWakeupEnabled_displayOn() {
		final ContentResolver contentResolver = mContext.getContentResolver();
		Settings.Global.putInt(contentResolver, Settings.Global.WIFI_WAKEUP_ENABLED, 1);
		when(mWifiManager.isAutoWakeupEnabled()).thenReturn(true);
		Settings.Global.putInt(contentResolver, Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 1);
		Settings.Global.putInt(contentResolver, Settings.Global.AIRPLANE_MODE_ON, 0);
		when(mPowerManager.isPowerSaveMode()).thenReturn(false);
		@@ -171,7 +176,7 @@ public class WifiSettings2Test {
		@Test
		public void setAdditionalSettingsSummaries_wifiWakeupDisabled_displayOff() {
		final ContentResolver contentResolver = mContext.getContentResolver();
		Settings.Global.putInt(contentResolver, Settings.Global.WIFI_WAKEUP_ENABLED, 0);
		when(mWifiManager.isAutoWakeupEnabled()).thenReturn(false);

		mWifiSettings2.setAdditionalSettingsSummaries();

tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -195,7 +195,7 @@ public class WifiSettingsTest {
		@Test
		public void setAdditionalSettingsSummaries_wifiWakeupEnabled_displayOn() {
		final ContentResolver contentResolver = mContext.getContentResolver();
		Settings.Global.putInt(contentResolver, Settings.Global.WIFI_WAKEUP_ENABLED, 1);
		when(mWifiManager.isAutoWakeupEnabled()).thenReturn(true);
		Settings.Global.putInt(contentResolver, Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 1);
		Settings.Global.putInt(contentResolver, Settings.Global.AIRPLANE_MODE_ON, 0);
		when(mPowerManager.isPowerSaveMode()).thenReturn(false);
		@@ -209,7 +209,7 @@ public class WifiSettingsTest {
		@Test
		public void setAdditionalSettingsSummaries_wifiWakeupDisabled_displayOff() {
		final ContentResolver contentResolver = mContext.getContentResolver();
		Settings.Global.putInt(contentResolver, Settings.Global.WIFI_WAKEUP_ENABLED, 0);
		when(mWifiManager.isAutoWakeupEnabled()).thenReturn(false);

		mWifiSettings.setAdditionalSettingsSummaries();