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

Commit 8101017e 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 am: f1a45b94

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



Change-Id: I22f9a26481bc6b3bf6ff08b005736185f436a31d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f5ec9815 f1a45b94

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