From caee81b4e5e1165cc3145e7b4873e48521100c78 Mon Sep 17 00:00:00 2001 From: Michael Plass Date: Tue, 16 Jan 2018 17:02:55 -0800 Subject: [PATCH] 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 --- res/xml/development_settings.xml | 5 - .../DevelopmentSettingsDashboardFragment.java | 1 - ...ggressiveHandoverPreferenceController.java | 85 ------------- ...ssiveHandoverPreferenceControllerTest.java | 112 ------------------ 4 files changed, 203 deletions(-) delete mode 100644 src/com/android/settings/development/WifiAggressiveHandoverPreferenceController.java delete mode 100644 tests/robotests/src/com/android/settings/development/WifiAggressiveHandoverPreferenceControllerTest.java diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml index aad5d2361b1..2b62964c194 100644 --- a/res/xml/development_settings.xml +++ b/res/xml/development_settings.xml @@ -202,11 +202,6 @@ android:title="@string/wifi_verbose_logging" android:summary="@string/wifi_verbose_logging_summary"/> - - 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); - } -} diff --git a/tests/robotests/src/com/android/settings/development/WifiAggressiveHandoverPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiAggressiveHandoverPreferenceControllerTest.java deleted file mode 100644 index ebda83749f3..00000000000 --- a/tests/robotests/src/com/android/settings/development/WifiAggressiveHandoverPreferenceControllerTest.java +++ /dev/null @@ -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); - } -}