Developer option to enable CBRS
Add new developer option to enable or disable CBRS Data Bug: 113278158 Test: On device Change-Id: I667a7c90b0bb7e9e0c70f41b28d376c9170e65d9
This commit is contained in:
@@ -10068,4 +10068,10 @@
|
|||||||
<!-- Homepage bottom menu. Title for display personalized Settings [CHAR LIMIT=30] -->
|
<!-- Homepage bottom menu. Title for display personalized Settings [CHAR LIMIT=30] -->
|
||||||
<string name="homepage_personal_settings">Your Settings</string>
|
<string name="homepage_personal_settings">Your Settings</string>
|
||||||
|
|
||||||
|
<!-- Setting Checkbox title whether to enable CBRS data. [CHAR LIMIT=40] -->
|
||||||
|
<string name="cbrs_data_switch">CBRS Data</string>
|
||||||
|
|
||||||
|
<!-- Title of implications of enabling CBRS Data -->
|
||||||
|
<string name="cbrs_data_switch_summary">CBRS Data</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@@ -233,6 +233,11 @@
|
|||||||
android:icon="@drawable/ic_usb"
|
android:icon="@drawable/ic_usb"
|
||||||
android:title="@string/usb_default_label"/>
|
android:title="@string/usb_default_label"/>
|
||||||
|
|
||||||
|
<SwitchPreference
|
||||||
|
android:key="cbrs_data_switch"
|
||||||
|
android:title="@string/cbrs_data_switch"
|
||||||
|
android:summary="@string/cbrs_data_switch" />
|
||||||
|
|
||||||
<SwitchPreference
|
<SwitchPreference
|
||||||
android:key="bluetooth_show_devices_without_names"
|
android:key="bluetooth_show_devices_without_names"
|
||||||
android:title="@string/bluetooth_show_devices_without_names"
|
android:title="@string/bluetooth_show_devices_without_names"
|
||||||
|
@@ -0,0 +1,66 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 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.util.Log;
|
||||||
|
import android.telephony.TelephonyManager;
|
||||||
|
|
||||||
|
import androidx.annotation.VisibleForTesting;
|
||||||
|
import androidx.preference.SwitchPreference;
|
||||||
|
import androidx.preference.Preference;
|
||||||
|
|
||||||
|
import com.android.settings.core.PreferenceControllerMixin;
|
||||||
|
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
|
||||||
|
|
||||||
|
public class CbrsDataSwitchPreferenceController extends DeveloperOptionsPreferenceController
|
||||||
|
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
|
||||||
|
private static final String CBRS_DATA_SWITCH_KEY = "cbrs_data_switch";
|
||||||
|
private static final String TAG = "CbrsDataSwitchPreferenceController";
|
||||||
|
private Context mContext;
|
||||||
|
|
||||||
|
private TelephonyManager mTelephonyManager;
|
||||||
|
|
||||||
|
public CbrsDataSwitchPreferenceController(Context context) {
|
||||||
|
super(context);
|
||||||
|
mContext = context;
|
||||||
|
mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getPreferenceKey() {
|
||||||
|
return CBRS_DATA_SWITCH_KEY;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isAvailable() {
|
||||||
|
return mTelephonyManager != null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||||
|
boolean state = (Boolean)newValue;
|
||||||
|
return mTelephonyManager.setAlternativeNetworkAccessState(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateState(Preference preference) {
|
||||||
|
boolean state = mTelephonyManager.isAlternativeNetworkAccessEnabled();
|
||||||
|
((SwitchPreference) mPreference).setChecked(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@@ -460,6 +460,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
|||||||
controllers.add(new FreeformWindowsPreferenceController(context));
|
controllers.add(new FreeformWindowsPreferenceController(context));
|
||||||
controllers.add(new ShortcutManagerThrottlingPreferenceController(context));
|
controllers.add(new ShortcutManagerThrottlingPreferenceController(context));
|
||||||
controllers.add(new EnableGnssRawMeasFullTrackingPreferenceController(context));
|
controllers.add(new EnableGnssRawMeasFullTrackingPreferenceController(context));
|
||||||
|
controllers.add(new CbrsDataSwitchPreferenceController(context));
|
||||||
controllers.add(new DefaultLaunchPreferenceController(context, "running_apps"));
|
controllers.add(new DefaultLaunchPreferenceController(context, "running_apps"));
|
||||||
controllers.add(new DefaultLaunchPreferenceController(context, "demo_mode"));
|
controllers.add(new DefaultLaunchPreferenceController(context, "demo_mode"));
|
||||||
controllers.add(new DefaultLaunchPreferenceController(context, "quick_settings_tiles"));
|
controllers.add(new DefaultLaunchPreferenceController(context, "quick_settings_tiles"));
|
||||||
|
@@ -0,0 +1,90 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 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 org.mockito.Mockito.verify;
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.telephony.TelephonyManager;
|
||||||
|
|
||||||
|
import androidx.preference.PreferenceScreen;
|
||||||
|
import androidx.preference.SwitchPreference;
|
||||||
|
|
||||||
|
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.RuntimeEnvironment;
|
||||||
|
import org.robolectric.Shadows;
|
||||||
|
|
||||||
|
@RunWith(SettingsRobolectricTestRunner.class)
|
||||||
|
public final class CbrsDataSwitchPreferenceControllerTest {
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private PreferenceScreen mPreferenceScreen;
|
||||||
|
private Context mContext;
|
||||||
|
private TelephonyManager mTelephonyManager;
|
||||||
|
private SwitchPreference mPreference;
|
||||||
|
private CbrsDataSwitchPreferenceController mController;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
MockitoAnnotations.initMocks(this);
|
||||||
|
mContext = RuntimeEnvironment.application;
|
||||||
|
mController = new CbrsDataSwitchPreferenceController(mContext);
|
||||||
|
mPreference = new SwitchPreference(mContext);
|
||||||
|
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
|
||||||
|
.thenReturn(mPreference);
|
||||||
|
mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
|
||||||
|
mController.displayPreference(mPreferenceScreen);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onPreferenceChanged_settingEnabled_shouldEnableANAS() {
|
||||||
|
mController.onPreferenceChange(mPreference, true);
|
||||||
|
|
||||||
|
assertThat(mTelephonyManager.isAlternativeNetworkAccessEnabled()).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onPreferenceChanged_settingDisabled_shouldDisableANAS() {
|
||||||
|
mController.onPreferenceChange(mPreference, false);
|
||||||
|
|
||||||
|
assertThat(mTelephonyManager.isAlternativeNetworkAccessEnabled()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void updateState_settingEnabled_shouldEnablePreference() {
|
||||||
|
mTelephonyManager.setAlternativeNetworkAccessState(true);
|
||||||
|
mController.updateState(mPreference);
|
||||||
|
|
||||||
|
assertThat(mPreference.isChecked()).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void updateState_settingDisabled_shouldDisablePreference() {
|
||||||
|
mTelephonyManager.setAlternativeNetworkAccessState(false);
|
||||||
|
mController.updateState(mPreference);
|
||||||
|
|
||||||
|
assertThat(mPreference.isChecked()).isFalse();
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user