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

Replaced use of Bluetooth resource by SystemApi

Browse Source 
Bluetooth resources are moved to the Bluetooth module,
we need to clear all existing usages of these resources.
Updated existing tests.

Tag: #feature
Test: make RunSettingsRoboTests
Bug: 211570675
Change-Id: I0f76df5043e69ed33cca40af3c32ac5b922b79ef
This commit is contained in:
Etienne Ruffieux
2022-01-06 17:24:09 +00:00
parent a4f936408c
commit 70c9f89e6f
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.development; package com.android.settings.development;
import android.bluetooth.BluetoothManager;
import android.content.Context; import android.content.Context;
import android.os.SystemProperties; import android.os.SystemProperties;
@@ -42,8 +43,9 @@ public class BluetoothMaxConnectedAudioDevicesPreferenceController extends
public BluetoothMaxConnectedAudioDevicesPreferenceController(Context context) { public BluetoothMaxConnectedAudioDevicesPreferenceController(Context context) {
super(context); super(context);
mDefaultMaxConnectedAudioDevices = mContext.getResources().getInteger( BluetoothManager mBluetoothManager = context.getSystemService(BluetoothManager.class);
com.android.internal.R.integer.config_bluetooth_max_connected_audio_devices); mDefaultMaxConnectedAudioDevices = mBluetoothManager.getAdapter()
.getMaxConnectedAudioDevices();
} }
@Override @Override

15
tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java
View File

@@ -24,8 +24,9 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothManager;
import android.content.Context; import android.content.Context;
import android.content.res.Resources;
import android.os.SystemProperties; import android.os.SystemProperties;
import androidx.preference.ListPreference; import androidx.preference.ListPreference;
@@ -52,7 +53,10 @@ public class BluetoothMaxConnectedAudioDevicesPreferenceControllerTest {
@Spy @Spy
private Context mSpyContext = RuntimeEnvironment.application; private Context mSpyContext = RuntimeEnvironment.application;
@Spy @Spy
private Resources mSpyResources = RuntimeEnvironment.application.getResources(); private BluetoothManager mBluetoothManager =
mSpyContext.getSystemService(BluetoothManager.class);
@Spy
private BluetoothAdapter mBluetoothAdapter = mBluetoothManager.getAdapter();
private ListPreference mPreference; private ListPreference mPreference;
private BluetoothMaxConnectedAudioDevicesPreferenceController mController; private BluetoothMaxConnectedAudioDevicesPreferenceController mController;
@@ -63,15 +67,16 @@ public class BluetoothMaxConnectedAudioDevicesPreferenceControllerTest {
@Before @Before
public void setup() { public void setup() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
doReturn(mSpyResources).when(mSpyContext).getResources(); doReturn(mBluetoothManager).when(mSpyContext).getSystemService(BluetoothManager.class);
doReturn(mBluetoothAdapter).when(mBluetoothManager).getAdapter();
// Get XML values without mock // Get XML values without mock
// Setup test list preference using XML values // Setup test list preference using XML values
mPreference = new ListPreference(mSpyContext); mPreference = new ListPreference(mSpyContext);
mPreference.setEntries(R.array.bluetooth_max_connected_audio_devices); mPreference.setEntries(R.array.bluetooth_max_connected_audio_devices);
mPreference.setEntryValues(R.array.bluetooth_max_connected_audio_devices_values); mPreference.setEntryValues(R.array.bluetooth_max_connected_audio_devices_values);
// Stub default max connected audio devices to a test controlled value // Stub default max connected audio devices to a test controlled value
doReturn(TEST_MAX_CONNECTED_AUDIO_DEVICES).when(mSpyResources).getInteger( doReturn(TEST_MAX_CONNECTED_AUDIO_DEVICES).when(mBluetoothAdapter)
com.android.internal.R.integer.config_bluetooth_max_connected_audio_devices); .getMaxConnectedAudioDevices();
// Init the actual controller // Init the actual controller
mController = new BluetoothMaxConnectedAudioDevicesPreferenceController(mSpyContext); mController = new BluetoothMaxConnectedAudioDevicesPreferenceController(mSpyContext);
// Construct preference in the controller via a mocked preference screen object // Construct preference in the controller via a mocked preference screen object