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

Commit 2f38adbe authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[conflict] Merge "Verify URI permissions for notification... 

Merge "[conflict] Merge "Verify URI permissions for notification shortcutIcon." into udc-dev am: fbbf6f75 am: 901505b5" into udc-d1-dev-plus-aosp
parents 8b41b3ba a2bb16d5

core/java/android/app/Notification.java

+1 −1
Original line number Diff line number Diff line
@@ -2929,7 +2929,7 @@ public class Notification implements Parcelable 
                }

            }













            visitIconUri(visitor, extras.getParcelable(EXTRA_CONVERSATION_ICON));













            visitIconUri(visitor, extras.getParcelable(EXTRA_CONVERSATION_ICON, Icon.class));















        }





























        if (isStyle(CallStyle.class) & extras != null) {