Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 am: 10e5657a39

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: Ia608719d3aa47159c80dd303bcc11360c000ee0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Oriol Prieto Gascó
2022-06-22 18:02:01 +00:00
committed by Automerger Merge Worker
3 changed files with 5 additions and 5 deletions

View File

@@ -70,8 +70,8 @@ public class BluetoothMaxConnectedAudioDevicesPreferenceControllerTest {
mPreference.setEntryValues(R.array.bluetooth_max_connected_audio_devices_values);
// Retrieve default max connected audio devices to a test controlled value
try {
Resources res = mSpyContext.getPackageManager().getResourcesForApplication("com.android.bluetooth.services");
TEST_MAX_CONNECTED_AUDIO_DEVICES = res.getInteger(res.getIdentifier("config_bluetooth_max_connected_audio_devices", "integer", "com.android.bluetooth.services"));
Resources res = mSpyContext.getPackageManager().getResourcesForApplication("com.android.bluetooth");
TEST_MAX_CONNECTED_AUDIO_DEVICES = res.getInteger(res.getIdentifier("config_bluetooth_max_connected_audio_devices", "integer", "com.android.bluetooth"));
} catch (PackageManager.NameNotFoundException e) {
e.printStackTrace();
}