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

Commit 3cd6cbe6 authored by Christophe Pinelli's avatar Christophe Pinelli Committed by Android (Google) Code Review
Browse files

Merge "Make mutable PendingIntent explicit" into tm-qpr-dev

parents 944348a5 9d46bca1

quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ public class DigitalWellBeingToastTest extends AbstractQuickStepTest { 
            runWithShellPermission(() ->

                    usageStatsManager.registerAppUsageLimitObserver(observerId, packages,

                            Duration.ofSeconds(600), Duration.ofSeconds(300),

                            PendingIntent.getActivity(mTargetContext, -1, new Intent(),

                            PendingIntent.getActivity(mTargetContext, -1, new Intent()

                                            .setPackage(mTargetContext.getPackageName()),

                                    PendingIntent.FLAG_MUTABLE)));



            mLauncher.goHome();

tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java

+2 −1
Original line number Diff line number Diff line
@@ -147,7 +147,8 @@ public class RequestPinItemTest extends AbstractLauncherUiTest { 


        // Set callback

        PendingIntent callback = PendingIntent.getBroadcast(mTargetContext, 0,

                new Intent(mCallbackAction), FLAG_ONE_SHOT | FLAG_MUTABLE);

                new Intent(mCallbackAction).setPackage(mTargetContext.getPackageName()),

                FLAG_ONE_SHOT | FLAG_MUTABLE);

        mTargetContext.sendBroadcast(RequestPinItemActivity.getCommandIntent(

                RequestPinItemActivity.class, "setCallback").putExtra(

                RequestPinItemActivity.EXTRA_PARAM + "0", callback));