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

Commit 3a448067 authored by Ioana Alexandru's avatar Ioana Alexandru Committed by Android Build Coastguard Worker
Browse files

Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS. 

Also added the person URIs in the test, since they weren't being
checked.

Test: atest NotificationManagerServiceTest & tested with POC from bug
Bug: 276729064
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:43b1711332763788c7abf05c3baa931296c45bbb)
Merged-In: I848545f7aee202495c515f47a32871a2cb6ae707
Change-Id: I848545f7aee202495c515f47a32871a2cb6ae707
parent fa539c85

core/java/android/app/Notification.java

+11 −0
Original line number Diff line number Diff line
@@ -2853,6 +2853,17 @@ public class Notification implements Parcelable 
            if (person != null) {

                visitor.accept(person.getIconUri());

            }













            final RemoteInputHistoryItem[] history = (RemoteInputHistoryItem[])













                    extras.getParcelableArray(Notification.EXTRA_REMOTE_INPUT_HISTORY_ITEMS);













            if (history != null) {













                for (int i = 0; i < history.length; i++) {













                    RemoteInputHistoryItem item = history[i];













                    if (item.getUri() != null) {













                        visitor.accept(item.getUri());













                    }













                }













            }















        }





























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

































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



+32
−0




























Original line number
Diff line number
Diff line








@@ -123,6 +123,7 @@ import android.app.NotificationManager;













import android.app.PendingIntent;















import android.app.Person;















import android.app.RemoteInput;













import android.app.RemoteInputHistoryItem;















import android.app.StatsManager;















import android.app.admin.DevicePolicyManagerInternal;















import android.app.usage.UsageStatsManagerInternal;










@@ -5164,10 +5165,36 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {













    public void testVisitUris() throws Exception {















        final Uri audioContents = Uri.parse("content://com.example/audio");















        final Uri backgroundImage = Uri.parse("content://com.example/background");













        final Icon personIcon1 = Icon.createWithContentUri("content://media/person1");













        final Icon personIcon2 = Icon.createWithContentUri("content://media/person2");













        final Icon personIcon3 = Icon.createWithContentUri("content://media/person3");













        final Person person1 = new Person.Builder()













                .setName("Messaging Person")













                .setIcon(personIcon1)













                .build();













        final Person person2 = new Person.Builder()













                .setName("People List Person 1")













                .setIcon(personIcon2)













                .build();













        final Person person3 = new Person.Builder()













                .setName("People List Person 2")













                .setIcon(personIcon3)













                .build();













        final Uri historyUri1 = Uri.parse("content://com.example/history1");













        final Uri historyUri2 = Uri.parse("content://com.example/history2");













        final RemoteInputHistoryItem historyItem1 = new RemoteInputHistoryItem(null, historyUri1,













                "a");













        final RemoteInputHistoryItem historyItem2 = new RemoteInputHistoryItem(null, historyUri2,













                "b");































        Bundle extras = new Bundle();















        extras.putParcelable(Notification.EXTRA_AUDIO_CONTENTS_URI, audioContents);















        extras.putString(Notification.EXTRA_BACKGROUND_IMAGE_URI, backgroundImage.toString());













        extras.putParcelable(Notification.EXTRA_MESSAGING_PERSON, person1);













        extras.putParcelableArrayList(Notification.EXTRA_PEOPLE_LIST,













                new ArrayList<>(Arrays.asList(person2, person3)));













        extras.putParcelableArray(Notification.EXTRA_REMOTE_INPUT_HISTORY_ITEMS,













                new RemoteInputHistoryItem[]{historyItem1, historyItem2});































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















                .setContentTitle("notification with uris")









@@ -5179,6 +5206,11 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {













        n.visitUris(visitor);















        verify(visitor, times(1)).accept(eq(audioContents));















        verify(visitor, times(1)).accept(eq(backgroundImage));













        verify(visitor, times(1)).accept(eq(personIcon1.getUri()));













        verify(visitor, times(1)).accept(eq(personIcon2.getUri()));













        verify(visitor, times(1)).accept(eq(personIcon3.getUri()));













        verify(visitor, times(1)).accept(eq(historyUri1));













        verify(visitor, times(1)).accept(eq(historyUri2));















    }































    @Test