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

Commit a2bb16d5 authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

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

[conflict] Merge "Verify URI permissions for notification shortcutIcon." into udc-dev am: fbbf6f75 am: 901505b5

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



Change-Id: I24945ecf0321b3a4259e93d7904b0c3e78382e38
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f465793a 901505b5

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) {