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

Commit 4b6b632b authored by Ioana Alexandru's avatar Ioana Alexandru Committed by Android Build Coastguard Worker
Browse files

DO NOT MERGE Revert "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS." 

This reverts commit 43b17113.

Reason for revert: regression reported at b/289223315

Bug: 289223315
Bug: 276729064
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bdc9b977e376fb3b6047530a179d00fd77f2aec1)
Merged-In: I101938fbc51592537023345ba1e642827510981b
Change-Id: I101938fbc51592537023345ba1e642827510981b
parent afc9a913

core/java/android/app/Notification.java

+0 −11
Original line number Diff line number Diff line
@@ -2811,17 +2811,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
@@ -114,7 +114,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;
@@ -4463,12 +4462,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);
@@ -4476,8 +4469,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")
@@ -4495,8 +4486,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