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

Commit fb6f9a12 authored by Ioana Alexandru's avatar Ioana Alexandru Committed by Automerger Merge Worker
Browse files

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

DO NOT MERGE Revert "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS." am: f69ded9e am: 04f8b3bc am: afe82ed2

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



Change-Id: I50321d88370a644ea8edff649e4d7b39b6a06b4a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 030335dc afe82ed2

core/java/android/app/Notification.java

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








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










@@ -5416,12 +5415,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);









@@ -5429,8 +5422,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")









@@ -5448,8 +5439,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