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

Commit cc2daf38 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "AVRCP: Use an immutable error intent" into rvc-qpr-dev am: 055a72f1 

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

Change-Id: If36b3b5c7db968eb1e8e8099807dcbec7e514a90
parents cae8fd9d 055a72f1

android/app/src/com/android/bluetooth/avrcpcontroller/BluetoothMediaBrowserService.java

+2 −1
Original line number Diff line number Diff line
@@ -112,8 +112,9 @@ public class BluetoothMediaBrowserService extends MediaBrowserServiceCompat { 
        Intent launchIntent = new Intent();

        launchIntent.setAction(BluetoothPrefs.BLUETOOTH_SETTING_ACTION);

        launchIntent.addCategory(BluetoothPrefs.BLUETOOTH_SETTING_CATEGORY);

        int flags = PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE;

        PendingIntent pendingIntent = PendingIntent.getActivity(getApplicationContext(), 0,

                launchIntent, PendingIntent.FLAG_UPDATE_CURRENT);

                launchIntent, flags);

        extras.putParcelable(ERROR_RESOLUTION_ACTION_INTENT, pendingIntent);

        PlaybackStateCompat errorState = new PlaybackStateCompat.Builder()

                .setErrorMessage(getString(R.string.bluetooth_disconnected))