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

Commit 37522770 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23892525']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23892525'] into security-aosp-tm-release.

Change-Id: Id3701bf5352ac1ccdef741292a9893cdb041b3ec
parents 593ee4d7 20aedba4

core/java/android/app/Notification.java

+0 −11
Original line number Diff line number Diff line
@@ -2857,17 +2857,6 @@ 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



+0
−11






























Original line number
Diff line number
Diff line







@@ -123,7 +123,6 @@ 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;








@@ -5182,12 +5181,6 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {







                .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);








@@ -5195,8 +5188,6 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {







        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")








@@ -5214,8 +5205,6 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {







        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