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

Merge "Replaced use of Bluetooth resource by SystemApi" am: 49a9361062

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1939113

Change-Id: Ieb884abbad772e2295f00aba59962472dec3de8d
This commit is contained in:
Etienne Ruffieux
2022-01-25 14:22:26 +00:00
committed by Automerger Merge Worker
parent 039cdfd764 49a9361062
commit 6f6f5e6b42
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;
import android.bluetooth.BluetoothManager;
import android.content.Context;
import android.os.SystemProperties;
@@ -42,8 +43,9 @@ public class BluetoothMaxConnectedAudioDevicesPreferenceController extends
public BluetoothMaxConnectedAudioDevicesPreferenceController(Context context) {
super(context);
mDefaultMaxConnectedAudioDevices = mContext.getResources().getInteger(
com.android.internal.R.integer.config_bluetooth_max_connected_audio_devices);
BluetoothManager mBluetoothManager = context.getSystemService(BluetoothManager.class);
mDefaultMaxConnectedAudioDevices = mBluetoothManager.getAdapter()
.getMaxConnectedAudioDevices();
}
@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.when;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothManager;
import android.content.Context;
import android.content.res.Resources;
import android.os.SystemProperties;
import androidx.preference.ListPreference;
@@ -52,7 +53,10 @@ public class BluetoothMaxConnectedAudioDevicesPreferenceControllerTest {
@Spy
private Context mSpyContext = RuntimeEnvironment.application;
@Spy
private Resources mSpyResources = RuntimeEnvironment.application.getResources();
private BluetoothManager mBluetoothManager =
mSpyContext.getSystemService(BluetoothManager.class);
@Spy
private BluetoothAdapter mBluetoothAdapter = mBluetoothManager.getAdapter();
private ListPreference mPreference;
private BluetoothMaxConnectedAudioDevicesPreferenceController mController;
@@ -63,15 +67,16 @@ public class BluetoothMaxConnectedAudioDevicesPreferenceControllerTest {
@Before
public void setup() {
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
// Setup test list preference using XML values
mPreference = new ListPreference(mSpyContext);
mPreference.setEntries(R.array.bluetooth_max_connected_audio_devices);
mPreference.setEntryValues(R.array.bluetooth_max_connected_audio_devices_values);
// Stub default max connected audio devices to a test controlled value
doReturn(TEST_MAX_CONNECTED_AUDIO_DEVICES).when(mSpyResources).getInteger(
com.android.internal.R.integer.config_bluetooth_max_connected_audio_devices);
doReturn(TEST_MAX_CONNECTED_AUDIO_DEVICES).when(mBluetoothAdapter)
.getMaxConnectedAudioDevices();
// Init the actual controller
mController = new BluetoothMaxConnectedAudioDevicesPreferenceController(mSpyContext);
// Construct preference in the controller via a mocked preference screen object