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

Commit 7e51f607 authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

Check more URIs in notifications 

Bug: 281044385
Test: presubmit + tested in current release

Change-Id: Ibba269bc4851ad898b046ad9d05bb6f708465feb
Merged-In: Ibba269bc4851ad898b046ad9d05bb6f708465feb
(cherry picked from commit 57bf60dd,
includes changes from commit 47fa2f79)
parent 30a49ad4

core/java/android/app/Person.java

+3 −0
Original line number Diff line number Diff line
@@ -189,6 +189,9 @@ public final class Person implements Parcelable { 
     */

    public void visitUris(@NonNull Consumer<Uri> visitor) {

        visitor.accept(getIconUri());

        if (mUri != null && !mUri.isEmpty()) {

            visitor.accept(Uri.parse(mUri));

        }

    }



    /** Builder for the immutable {@link Person} class. */

core/java/android/widget/RemoteViews.java

+24 −0
Original line number Diff line number Diff line
@@ -1089,6 +1089,13 @@ public class RemoteViews implements Parcelable, Filter { 
            return (SET_REMOTE_ADAPTER_TAG + "_" + viewId);

        }



        @Override

        public void visitUris(@NonNull Consumer<Uri> visitor) {

            for (RemoteViews remoteViews : list) {

                remoteViews.visitUris(visitor);

            }

        }



        int viewTypeCount;

        ArrayList<RemoteViews> list;

    }
@@ -1291,6 +1298,14 @@ public class RemoteViews implements Parcelable, Filter { 
        public String getUniqueKey() {

            return (SET_REMOTE_ADAPTER_TAG + "_" + viewId);

        }



        @Override

        public void visitUris(@NonNull Consumer<Uri> visitor) {

            RemoteCollectionItems items = getCollectionItemsFromFuture(mItemsFuture);

            if (items != null) {

              items.visitUris(visitor);

            }

        }

    }



    private class SetRemoteViewsAdapterIntent extends Action {
@@ -7275,6 +7290,15 @@ public class RemoteViews implements Parcelable, Filter { 
                        Math.max(mViewTypeCount, 1));

            }

        }



        /**

         * See {@link RemoteViews#visitUris(Consumer)}.

         */

        private void visitUris(@NonNull Consumer<Uri> visitor) {

            for (RemoteViews view : mViews) {

                view.visitUris(visitor);

            }

        }

    }



    /**