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

Commit aac338f9 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 udc-dev am: 5526f066 

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



Change-Id: I53ad2ae57a25b6fb70b8e9750f8f4666e59e3089
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6fd85b55 5526f066

core/java/android/app/Notification.java

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

            }













            final Person person = extras.getParcelable(EXTRA_MESSAGING_PERSON, Person.class);













            if (person != null) {













                visitor.accept(person.getIconUri());













            }



























            final RemoteInputHistoryItem[] history = extras.getParcelableArray(















                    Notification.EXTRA_REMOTE_INPUT_HISTORY_ITEMS,















                    RemoteInputHistoryItem.class);









@@ -2906,9 +2901,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, Person.class);













            if (person != null) {













                visitor.accept(person.getIconUri());















            }



























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















            final Parcelable[] messages = extras.getParcelableArray(EXTRA_MESSAGES,















                    Parcelable.class);















            if (!ArrayUtils.isEmpty(messages)) {










@@ -2938,9 +2938,8 @@ public class Notification implements Parcelable













            }





























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













        }



























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













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















            Person callPerson = extras.getParcelable(EXTRA_CALL_PERSON, Person.class);















            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








@@ -5902,6 +5902,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");