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

Settings: Use new API for tethering auto shutdown

Browse Source 
Bug: 148514485
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=
com.android.settings.wifi.tether.WifiTetherAutoOffPreferenceControllerTest
Test: Manually verified the toggle from Settings.
Change-Id: I5f89c6149b9f2e7145ecb1cf656adb3d3e8f1bff
This commit is contained in:
Roshan Pius
2020-02-10 12:15:23 -08:00
parent f2a52c30a1
commit a023de72a9
2 changed files with 45 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java
View File

@@ -17,7 +17,8 @@
package com.android.settings.wifi.tether;
import android.content.Context;
import android.provider.Settings;
import android.net.wifi.SoftApConfiguration;
import android.net.wifi.WifiManager;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
@@ -27,8 +28,11 @@ import com.android.settings.core.BasePreferenceController;
public class WifiTetherAutoOffPreferenceController extends BasePreferenceController implements
Preference.OnPreferenceChangeListener {
private final WifiManager mWifiManager;
public WifiTetherAutoOffPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
mWifiManager = context.getSystemService(WifiManager.class);
}
@Override
@@ -38,8 +42,8 @@ public class WifiTetherAutoOffPreferenceController extends BasePreferenceControl
@Override
public void updateState(Preference preference) {
final boolean settingsOn = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.SOFT_AP_TIMEOUT_ENABLED, 1) != 0;
SoftApConfiguration softApConfiguration = mWifiManager.getSoftApConfiguration();
final boolean settingsOn = softApConfiguration.isAutoShutdownEnabled();
((SwitchPreference) preference).setChecked(settingsOn);
}
@@ -47,8 +51,11 @@ public class WifiTetherAutoOffPreferenceController extends BasePreferenceControl
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
final boolean settingsOn = (Boolean) newValue;
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.SOFT_AP_TIMEOUT_ENABLED, settingsOn ? 1 : 0);
return true;
SoftApConfiguration softApConfiguration = mWifiManager.getSoftApConfiguration();
SoftApConfiguration newSoftApConfiguration =
new SoftApConfiguration.Builder(softApConfiguration)
.setAutoShutdownEnabled(settingsOn)
.build();
return mWifiManager.setSoftApConfiguration(newSoftApConfiguration);
}
}