Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10e5657a authored by Oriol Prieto Gascó's avatar Oriol Prieto Gascó Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I7fcfd55573d121122867893a5624c297a1f18653
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c00d5a7f d6166e42

src/com/android/settings/bluetooth/BluetoothPermissionRequest.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -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();

        }

tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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();

    }