From 8cc23bd2fe158d2f721cff53698956f2e9616e9d Mon Sep 17 00:00:00 2001 From: Jack He Date: Thu, 1 Apr 2021 02:07:40 -0700 Subject: [PATCH] BT: Use DeviceConfig for Bluetooth GD toggle Bug: 184235563 Test: make and toggle GD settings, unit test Change-Id: I643339f80a82950b1b1ffcf60830f93a955e6666 --- ...toothGabeldorschePreferenceController.java | 17 +-- ...hGabeldorschePreferenceControllerTest.java | 112 ++++++++++++++++++ 2 files changed, 121 insertions(+), 8 deletions(-) create mode 100644 tests/robotests/src/com/android/settings/development/BluetoothGabeldorschePreferenceControllerTest.java diff --git a/src/com/android/settings/development/BluetoothGabeldorschePreferenceController.java b/src/com/android/settings/development/BluetoothGabeldorschePreferenceController.java index 48a3e95c4b1..f5c30f5811c 100644 --- a/src/com/android/settings/development/BluetoothGabeldorschePreferenceController.java +++ b/src/com/android/settings/development/BluetoothGabeldorschePreferenceController.java @@ -17,7 +17,7 @@ package com.android.settings.development; import android.content.Context; -import android.os.SystemProperties; +import android.provider.DeviceConfig; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; @@ -35,9 +35,9 @@ public class BluetoothGabeldorschePreferenceController extends private static final String BLUETOOTH_GABELDORSCHE_KEY = "bluetooth_gabeldorsche_enable"; + @VisibleForTesting - static final String BLUETOOTH_GABELDORSCHE_PROPERTY = - "bluetooth.gd.enabled"; + static final String CURRENT_GD_FLAG = "INIT_gd_scanning"; public BluetoothGabeldorschePreferenceController(Context context) { super(context); @@ -51,22 +51,23 @@ public class BluetoothGabeldorschePreferenceController extends @Override public boolean onPreferenceChange(Preference preference, Object newValue) { final boolean isEnabled = (Boolean) newValue; - SystemProperties.set(BLUETOOTH_GABELDORSCHE_PROPERTY, - isEnabled ? "true" : "false"); + DeviceConfig.setProperty(DeviceConfig.NAMESPACE_BLUETOOTH, + CURRENT_GD_FLAG, isEnabled ? "true" : "false", false /* makeDefault */); return true; } @Override public void updateState(Preference preference) { - final boolean isEnabled = SystemProperties.getBoolean( - BLUETOOTH_GABELDORSCHE_PROPERTY, false /* default */); + final boolean isEnabled = DeviceConfig.getBoolean( + DeviceConfig.NAMESPACE_BLUETOOTH, CURRENT_GD_FLAG, false /* default */); ((SwitchPreference) mPreference).setChecked(isEnabled); } @Override protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); - SystemProperties.set(BLUETOOTH_GABELDORSCHE_PROPERTY, "false"); + DeviceConfig.setProperty(DeviceConfig.NAMESPACE_BLUETOOTH, + CURRENT_GD_FLAG, null, false /* makeDefault */); ((SwitchPreference) mPreference).setChecked(false); } } diff --git a/tests/robotests/src/com/android/settings/development/BluetoothGabeldorschePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothGabeldorschePreferenceControllerTest.java new file mode 100644 index 00000000000..472a96059bd --- /dev/null +++ b/tests/robotests/src/com/android/settings/development/BluetoothGabeldorschePreferenceControllerTest.java @@ -0,0 +1,112 @@ +/* + * Copyright (C) 2021 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.BluetoothGabeldorschePreferenceController + .CURRENT_GD_FLAG; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.content.Context; +import android.provider.DeviceConfig; + +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; + +@RunWith(RobolectricTestRunner.class) +public class BluetoothGabeldorschePreferenceControllerTest { + + @Mock + private SwitchPreference mPreference; + @Mock + private PreferenceScreen mPreferenceScreen; + + private BluetoothGabeldorschePreferenceController mController; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + Context context = RuntimeEnvironment.application; + mController = new BluetoothGabeldorschePreferenceController(context); + when(mPreferenceScreen.findPreference(mController.getPreferenceKey())) + .thenReturn(mPreference); + mController.displayPreference(mPreferenceScreen); + } + + @Test + public void onPreferenceChanged_settingEnabled_shouldTurnOnBluetoothGabeldorsche() { + mController.onPreferenceChange(mPreference, true /* new value */); + + boolean enabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, + CURRENT_GD_FLAG, false /* defaultValue */); + + assertThat(enabled).isTrue(); + } + + @Test + public void onPreferenceChanged_settingDisabled_shouldTurnOffBluetoothGabeldorsche() { + mController.onPreferenceChange(mPreference, false /* new value */); + + boolean enabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, + CURRENT_GD_FLAG, false /* defaultValue */); + + assertThat(enabled).isFalse(); + } + + @Test + public void updateState_settingEnabled_preferenceShouldBeChecked() { + DeviceConfig.setProperty(DeviceConfig.NAMESPACE_BLUETOOTH, + CURRENT_GD_FLAG, "true", false /* makeDefault */); + + mController.updateState(mPreference); + + verify(mPreference).setChecked(true); + } + + @Test + public void updateState_settingDisabled_preferenceShouldNotBeChecked() { + DeviceConfig.setProperty(DeviceConfig.NAMESPACE_BLUETOOTH, + CURRENT_GD_FLAG, "false", false /* makeDefault */); + + mController.updateState(mPreference); + + verify(mPreference).setChecked(false); + } + + @Test + public void onDeveloperOptionsDisabled_shouldDisablePreference() { + mController.onDeveloperOptionsDisabled(); + + String configStr = DeviceConfig.getProperty(DeviceConfig.NAMESPACE_BLUETOOTH, + CURRENT_GD_FLAG); + + assertThat(configStr).isNull(); + verify(mPreference).setEnabled(false); + verify(mPreference).setChecked(false); + } +}