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

Commit 9fdd5fc9 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] Add FLAG_IMMUTABLE for PendingIntents. 2p: d00f87c9 

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

Change-Id: Idcc2bccc10d196c2bcb436a69e1f996987faa47c
parents 121e1c18 d00f87c9

src/com/android/documentsui/services/CopyJob.java

+2 −1
Original line number Diff line number Diff line
@@ -187,7 +187,8 @@ class CopyJob extends ResolvedResourcesJob { 
                .setContentText(service.getString(

                        R.string.notification_touch_for_details))

                .setContentIntent(PendingIntent.getActivity(appContext, 0, navigateIntent,

                        PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT))

                        PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT

                                | PendingIntent.FLAG_IMMUTABLE))

                .setCategory(Notification.CATEGORY_ERROR)

                .setSmallIcon(R.drawable.ic_menu_copy)

                .setAutoCancel(true);

src/com/android/documentsui/services/Job.java

+2 −1
Original line number Diff line number Diff line
@@ -328,7 +328,8 @@ abstract public class Job implements Runnable { 
                .setContentTitle(title)

                .setContentIntent(

                        PendingIntent.getActivity(appContext, 0,

                                buildNavigateIntent(INTENT_TAG_PROGRESS), 0))

                                buildNavigateIntent(INTENT_TAG_PROGRESS),

                                PendingIntent.FLAG_IMMUTABLE))

                .setCategory(Notification.CATEGORY_PROGRESS)

                .setSmallIcon(icon)

                .setOngoing(true);

tests/common/com/android/documentsui/DemoProvider.java

+2 −1
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ public class DemoProvider extends TestRootProvider { 
            case DIR_AUTH:

                Intent intent = new Intent("com.android.documentsui.test.action.AUTHENTICATE");

                PendingIntent pIntent = PendingIntent.getActivity(getContext(),

                        AbstractActionHandler.CODE_AUTHENTICATION, intent, 0);

                        AbstractActionHandler.CODE_AUTHENTICATION, intent,

                        PendingIntent.FLAG_IMMUTABLE);

                throw new AuthenticationRequiredException(new UnsupportedOperationException(),

                        pIntent);

tests/unit/com/android/documentsui/files/ActionHandlerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ public class ActionHandlerTest { 
    public void testAuthentication() throws Exception {

        PendingIntent intent = PendingIntent.getActivity(

                InstrumentationRegistry.getInstrumentation().getTargetContext(), 0, new Intent(),

                0);

                PendingIntent.FLAG_IMMUTABLE);



        mHandler.startAuthentication(intent);

        assertEquals(intent.getIntentSender(), mActivity.startIntentSender.getLastValue().first);