From f528e7de49b0ddd6187e1f56f6439c5f155ee13e Mon Sep 17 00:00:00 2001 From: Oriol Prieto Gasco Date: Sat, 18 Jun 2022 12:49:42 +0000 Subject: [PATCH] Use com.android.bluetooth as the BT stack APK Test: TH Bug: 236187653, 236192423 Change-Id: Ia86d195780a4994607b5533420cb72bd458d4f9a --- .../settings/bluetooth/BluetoothPermissionRequest.java | 2 +- ...BluetoothMaxConnectedAudioDevicesPreferenceController.java | 4 ++-- ...toothMaxConnectedAudioDevicesPreferenceControllerTest.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java index 7d27a37924f..8542fcd2461 100644 --- a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java +++ b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java @@ -126,7 +126,7 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver { // "Clear All Notifications" button Intent deleteIntent = new Intent(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY); - deleteIntent.setPackage("com.android.bluetooth.services"); + deleteIntent.setPackage("com.android.bluetooth"); deleteIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice); deleteIntent.putExtra(BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT, BluetoothDevice.CONNECTION_ACCESS_NO); diff --git a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java index af9a29587a2..bd8169a80fe 100644 --- a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java +++ b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java @@ -47,10 +47,10 @@ public class BluetoothMaxConnectedAudioDevicesPreferenceController extends try { Resources res = context.getPackageManager().getResourcesForApplication( - "com.android.bluetooth.services"); + "com.android.bluetooth"); mDefaultMaxConnectedAudioDevices = res.getInteger(res.getIdentifier( "config_bluetooth_max_connected_audio_devices", - "integer", "com.android.bluetooth.services")); + "integer", "com.android.bluetooth")); } catch (PackageManager.NameNotFoundException e) { e.printStackTrace(); } diff --git a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java index 53494ab5d23..72477b94585 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java @@ -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(); }