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

Commit 541ea84b authored by Matías Hernández's avatar Matías Hernández Committed by Automerger Merge Worker
Browse files

Merge "Visit Uris related to Notification style extras" into sc-dev am: 3a4398cf am: dc8e7dc5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24420396



Change-Id: I5db2e96b19076db3983ce63e0b8b25717913b7ab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 15176a4f dc8e7dc5

core/java/android/app/Notification.java

+8 −9
Original line number Diff line number Diff line
@@ -2811,11 +2811,6 @@ public class Notification implements Parcelable 
                }

            }



            final Person person = extras.getParcelable(EXTRA_MESSAGING_PERSON);

            if (person != null) {

                visitor.accept(person.getIconUri());

            }



            final RemoteInputHistoryItem[] history = getParcelableArrayFromBundle(extras,

                Notification.EXTRA_REMOTE_INPUT_HISTORY_ITEMS, RemoteInputHistoryItem.class);

            if (history != null) {
@@ -2826,9 +2821,14 @@ public class Notification implements Parcelable 
                    }

                }

            }



            // Extras for MessagingStyle. We visit them even if not isStyle(MessagingStyle), since

            // Notification Listeners might use directly (without the isStyle check).

            final Person person = extras.getParcelable(EXTRA_MESSAGING_PERSON);

            if (person != null) {

                visitor.accept(person.getIconUri());

            }



        if (isStyle(MessagingStyle.class) && extras != null) {

            final Parcelable[] messages = extras.getParcelableArray(EXTRA_MESSAGES);

            if (!ArrayUtils.isEmpty(messages)) {

                for (MessagingStyle.Message message : MessagingStyle.Message
@@ -2856,9 +2856,8 @@ public class Notification implements Parcelable 
            }



            visitIconUri(visitor, extras.getParcelable(EXTRA_CONVERSATION_ICON));

        }



        if (isStyle(CallStyle.class) & extras != null) {

            // Extras for CallStyle (same reason for visiting without checking isStyle).

            Person callPerson = extras.getParcelable(EXTRA_CALL_PERSON);

            if (callPerson != null) {

                visitor.accept(callPerson.getIconUri());

services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java

+43 −0
Original line number Diff line number Diff line
@@ -4637,6 +4637,49 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
        verify(visitor, times(1)).accept(eq(verificationIcon.getUri()));

    }



    @Test

    public void testVisitUris_styleExtrasWithoutStyle() {

        Notification notification = new Notification.Builder(mContext, "a")

                .setSmallIcon(android.R.drawable.sym_def_app_icon)

                .build();



        Notification.MessagingStyle messagingStyle = new Notification.MessagingStyle(

                personWithIcon("content://user"))

                .addHistoricMessage(new Notification.MessagingStyle.Message("Heyhey!",

                                System.currentTimeMillis(),

                                personWithIcon("content://historicalMessenger")))

                .addMessage(new Notification.MessagingStyle.Message("Are you there",

                                System.currentTimeMillis(),

                                personWithIcon("content://messenger")))

                        .setShortcutIcon(

                                Icon.createWithContentUri("content://conversationShortcut"));

        messagingStyle.addExtras(notification.extras); // Instead of Builder.setStyle(style).



        Notification.CallStyle callStyle = Notification.CallStyle.forOngoingCall(

                        personWithIcon("content://caller"),

                        PendingIntent.getActivity(mContext, 0, new Intent(),

                                PendingIntent.FLAG_IMMUTABLE))

                .setVerificationIcon(Icon.createWithContentUri("content://callVerification"));

        callStyle.addExtras(notification.extras); // Same.



        Consumer<Uri> visitor = (Consumer<Uri>) spy(Consumer.class);

        notification.visitUris(visitor);



        verify(visitor).accept(eq(Uri.parse("content://user")));

        verify(visitor).accept(eq(Uri.parse("content://historicalMessenger")));

        verify(visitor).accept(eq(Uri.parse("content://messenger")));

        verify(visitor).accept(eq(Uri.parse("content://conversationShortcut")));

        verify(visitor).accept(eq(Uri.parse("content://caller")));

        verify(visitor).accept(eq(Uri.parse("content://callVerification")));

    }



    private static Person personWithIcon(String iconUri) {

        return new Person.Builder()

                .setName("Mr " + iconUri)

                .setIcon(Icon.createWithContentUri(iconUri))

                .build();

    }



    @Test

    public void testVisitUris_wearableExtender() {

        Icon actionIcon = Icon.createWithContentUri("content://media/action");