Remove aggressive handover developer setting
The developer setting for aggressive wifi to mobile data handover is no longer used by the framework, so it should not appear in the settings UI. Bug: 72063774 Test: m RunSettingsRoboTests -j40 Test: Manually check developer options, make sure aggressive handover is gone Change-Id: Id54c714fc82fb27abc0b4116f2b82be68cc6d151
This commit is contained in:
Michael Plass
@@ -202,11 +202,6 @@
|
|||||||
android:title="@string/wifi_verbose_logging"
|
android:title="@string/wifi_verbose_logging"
|
||||||
android:summary="@string/wifi_verbose_logging_summary"/>
|
android:summary="@string/wifi_verbose_logging_summary"/>
|
||||||
|
|
||||||
<SwitchPreference
|
|
||||||
android:key="wifi_aggressive_handover"
|
|
||||||
android:title="@string/wifi_aggressive_handover"
|
|
||||||
android:summary="@string/wifi_aggressive_handover_summary"/>
|
|
||||||
|
|
||||||
<SwitchPreference
|
<SwitchPreference
|
||||||
android:key="wifi_allow_scan_with_traffic"
|
android:key="wifi_allow_scan_with_traffic"
|
||||||
android:title="@string/wifi_allow_scan_with_traffic"
|
android:title="@string/wifi_allow_scan_with_traffic"
|
||||||
|
|||||||
@@ -398,7 +398,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
|||||||
controllers.add(new CameraLaserSensorPreferenceController(context));
|
controllers.add(new CameraLaserSensorPreferenceController(context));
|
||||||
controllers.add(new WifiDisplayCertificationPreferenceController(context));
|
controllers.add(new WifiDisplayCertificationPreferenceController(context));
|
||||||
controllers.add(new WifiVerboseLoggingPreferenceController(context));
|
controllers.add(new WifiVerboseLoggingPreferenceController(context));
|
||||||
controllers.add(new WifiAggressiveHandoverPreferenceController(context));
|
|
||||||
controllers.add(new WifiRoamScansPreferenceController(context));
|
controllers.add(new WifiRoamScansPreferenceController(context));
|
||||||
controllers.add(new MobileDataAlwaysOnPreferenceController(context));
|
controllers.add(new MobileDataAlwaysOnPreferenceController(context));
|
||||||
controllers.add(new TetheringHardwareAccelPreferenceController(context));
|
controllers.add(new TetheringHardwareAccelPreferenceController(context));
|
||||||
|
|||||||
@@ -1,85 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2017 The Android Open Source Project
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.android.settings.development;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.net.wifi.WifiManager;
|
|
||||||
import android.support.annotation.VisibleForTesting;
|
|
||||||
import android.support.v14.preference.SwitchPreference;
|
|
||||||
import android.support.v7.preference.Preference;
|
|
||||||
import android.support.v7.preference.PreferenceScreen;
|
|
||||||
|
|
||||||
import com.android.settings.core.PreferenceControllerMixin;
|
|
||||||
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
|
|
||||||
|
|
||||||
public class WifiAggressiveHandoverPreferenceController extends
|
|
||||||
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
|
|
||||||
PreferenceControllerMixin {
|
|
||||||
|
|
||||||
private static final String WIFI_AGGRESSIVE_HANDOVER_KEY = "wifi_aggressive_handover";
|
|
||||||
|
|
||||||
@VisibleForTesting
|
|
||||||
static final int SETTING_VALUE_ON = 1;
|
|
||||||
@VisibleForTesting
|
|
||||||
static final int SETTING_VALUE_OFF = 0;
|
|
||||||
|
|
||||||
private final WifiManager mWifiManager;
|
|
||||||
private SwitchPreference mPreference;
|
|
||||||
|
|
||||||
public WifiAggressiveHandoverPreferenceController(Context context) {
|
|
||||||
super(context);
|
|
||||||
|
|
||||||
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getPreferenceKey() {
|
|
||||||
return WIFI_AGGRESSIVE_HANDOVER_KEY;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void displayPreference(PreferenceScreen screen) {
|
|
||||||
super.displayPreference(screen);
|
|
||||||
|
|
||||||
mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
|
||||||
boolean isEnabled = (Boolean) newValue;
|
|
||||||
mWifiManager.enableAggressiveHandover(isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void updateState(Preference preference) {
|
|
||||||
boolean enabled = mWifiManager.getAggressiveHandover() > 0;
|
|
||||||
mPreference.setChecked(enabled);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onDeveloperOptionsSwitchEnabled() {
|
|
||||||
mPreference.setEnabled(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onDeveloperOptionsSwitchDisabled() {
|
|
||||||
mWifiManager.enableAggressiveHandover(SETTING_VALUE_OFF);
|
|
||||||
mPreference.setChecked(false);
|
|
||||||
mPreference.setEnabled(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,112 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2017 The Android Open Source Project
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.android.settings.development;
|
|
||||||
|
|
||||||
import static com.android.settings.development.WifiAggressiveHandoverPreferenceController
|
|
||||||
.SETTING_VALUE_OFF;
|
|
||||||
import static com.android.settings.development.WifiAggressiveHandoverPreferenceController
|
|
||||||
.SETTING_VALUE_ON;
|
|
||||||
|
|
||||||
import static org.mockito.Mockito.verify;
|
|
||||||
import static org.mockito.Mockito.when;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.net.wifi.WifiManager;
|
|
||||||
import android.support.v14.preference.SwitchPreference;
|
|
||||||
import android.support.v7.preference.PreferenceScreen;
|
|
||||||
|
|
||||||
import com.android.settings.TestConfig;
|
|
||||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
|
||||||
|
|
||||||
import org.junit.Before;
|
|
||||||
import org.junit.Test;
|
|
||||||
import org.junit.runner.RunWith;
|
|
||||||
import org.mockito.Mock;
|
|
||||||
import org.mockito.MockitoAnnotations;
|
|
||||||
import org.robolectric.annotation.Config;
|
|
||||||
|
|
||||||
@RunWith(SettingsRobolectricTestRunner.class)
|
|
||||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
|
||||||
public class WifiAggressiveHandoverPreferenceControllerTest {
|
|
||||||
|
|
||||||
@Mock
|
|
||||||
private Context mContext;
|
|
||||||
@Mock
|
|
||||||
private WifiManager mWifiManager;
|
|
||||||
@Mock
|
|
||||||
private SwitchPreference mPreference;
|
|
||||||
@Mock
|
|
||||||
private PreferenceScreen mPreferenceScreen;
|
|
||||||
|
|
||||||
private WifiAggressiveHandoverPreferenceController mController;
|
|
||||||
|
|
||||||
@Before
|
|
||||||
public void setup() {
|
|
||||||
MockitoAnnotations.initMocks(this);
|
|
||||||
when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
|
|
||||||
mController = new WifiAggressiveHandoverPreferenceController(mContext);
|
|
||||||
when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
|
|
||||||
mPreference);
|
|
||||||
mController.displayPreference(mPreferenceScreen);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void onPreferenceChange_settingEnabled_shouldEnableAggressiveHandover() {
|
|
||||||
mController.onPreferenceChange(mPreference, true /* new value */);
|
|
||||||
|
|
||||||
verify(mWifiManager).enableAggressiveHandover(SETTING_VALUE_ON);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void onPreferenceChange_settingDisabled_shouldDisableAggressiveHandover() {
|
|
||||||
mController.onPreferenceChange(mPreference, false /* new value */);
|
|
||||||
|
|
||||||
verify(mWifiManager).enableAggressiveHandover(SETTING_VALUE_OFF);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void updateState_settingEnabled_shouldEnablePreference() {
|
|
||||||
when(mWifiManager.getAggressiveHandover()).thenReturn(1);
|
|
||||||
mController.updateState(mPreference);
|
|
||||||
|
|
||||||
verify(mPreference).setChecked(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void updateState_settingDisabled_shouldDisablePreference() {
|
|
||||||
when(mWifiManager.getAggressiveHandover()).thenReturn(0);
|
|
||||||
mController.updateState(mPreference);
|
|
||||||
|
|
||||||
verify(mPreference).setChecked(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
|
|
||||||
mController.onDeveloperOptionsSwitchEnabled();
|
|
||||||
|
|
||||||
verify(mPreference).setEnabled(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
|
|
||||||
mController.onDeveloperOptionsSwitchDisabled();
|
|
||||||
|
|
||||||
verify(mWifiManager).enableAggressiveHandover(SETTING_VALUE_OFF);
|
|
||||||
verify(mPreference).setEnabled(false);
|
|
||||||
verify(mPreference).setChecked(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user