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

Commit 4c52b985 authored by Achim Thesmann's avatar Achim Thesmann Committed by Android (Google) Code Review
Browse files

Merge "Opt in systemui for BAL" into udc-qpr-dev

parents 95ec397e 17f7c255

packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDataManager.kt

+3 −0
Original line number Diff line number Diff line
@@ -1253,6 +1253,9 @@ class MediaDataManager( 
        return try {

            val options = BroadcastOptions.makeBasic()

            options.setInteractive(true)

            options.setPendingIntentBackgroundActivityStartMode(

                BroadcastOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED

            )

            intent.send(options.toBundle())

            true

        } catch (e: PendingIntent.CanceledException) {

packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaControlPanel.java

+7 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static com.android.systemui.media.controls.models.recommendation.Smartspa 
import android.animation.Animator;

import android.animation.AnimatorInflater;

import android.animation.AnimatorSet;

import android.app.ActivityOptions;

import android.app.BroadcastOptions;

import android.app.PendingIntent;

import android.app.WallpaperColors;
@@ -535,7 +536,10 @@ public class MediaControlPanel { 
                        mLockscreenUserManager.getCurrentUserId());

                if (showOverLockscreen) {

                    try {

                        clickIntent.send();

                        ActivityOptions opts = ActivityOptions.makeBasic();

                        opts.setPendingIntentBackgroundActivityStartMode(

                                ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);

                        clickIntent.send(opts.toBundle());

                    } catch (PendingIntent.CanceledException e) {

                        Log.e(TAG, "Pending intent for " + key + " was cancelled");

                    }
@@ -684,6 +688,8 @@ public class MediaControlPanel { 
                                try {

                                    BroadcastOptions options = BroadcastOptions.makeBasic();

                                    options.setInteractive(true);

                                    options.setPendingIntentBackgroundActivityStartMode(

                                            ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);

                                    deviceIntent.send(options.toBundle());

                                } catch (PendingIntent.CanceledException e) {

                                    Log.e(TAG, "Device pending intent was canceled");

packages/SystemUI/src/com/android/systemui/screenshot/ActionProxyReceiver.java

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ public class ActionProxyReceiver extends BroadcastReceiver { 
            ActivityOptions opts = ActivityOptions.makeBasic();

            opts.setDisallowEnterPictureInPictureWhileLaunching(

                    intent.getBooleanExtra(EXTRA_DISALLOW_ENTER_PIP, false));

            opts.setPendingIntentBackgroundActivityStartMode(

                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);

            try {

                actionIntent.send(context, 0, null, null, null, null, opts.toBundle());

                if (intent.getBooleanExtra(ScreenshotController.EXTRA_OVERRIDE_TRANSITION, false)) {

packages/SystemUI/src/com/android/systemui/screenshot/OverlayActionChip.java

+2 −0
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ public class OverlayActionChip extends FrameLayout { 
            try {

                BroadcastOptions options = BroadcastOptions.makeBasic();

                options.setInteractive(true);

                options.setPendingIntentBackgroundActivityStartMode(

                        BroadcastOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);

                intent.send(options.toBundle());

                finisher.run();

            } catch (PendingIntent.CanceledException e) {

packages/SystemUI/src/com/android/systemui/screenshot/SmartActionsReceiver.java

+2 −1
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ public class SmartActionsReceiver extends BroadcastReceiver { 
            Log.d(TAG, "Executing smart action [" + actionType + "]:" + pendingIntent.getIntent());

        }

        ActivityOptions opts = ActivityOptions.makeBasic();



        opts.setPendingIntentBackgroundActivityStartMode(

                ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);

        try {

            pendingIntent.send(context, 0, fillIn, null, null, null, opts.toBundle());

        } catch (PendingIntent.CanceledException e) {