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

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

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

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

Change-Id: I924fd9741e485ae80dfa2d30b7d24b0550e0262a
parents 6b61d096 1914462f

core/java/android/app/Notification.java

+0 −11
Original line number Diff line number Diff line
@@ -2533,17 +2533,6 @@ public class Notification implements Parcelable 
            if (person != null && person.getIconUri() != 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 (MessagingStyle.class.equals(getNotificationStyle()) && extras != null) {

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

+0 −11
Original line number Diff line number Diff line
@@ -102,7 +102,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;
@@ -4262,12 +4261,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);
@@ -4275,8 +4268,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")
@@ -4294,8 +4285,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