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

Commit 314b0d4c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
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 am: 2f38adbe

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



Change-Id: I6ad43cfb1fddc0367b7811c8d45067fad1d9da6b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b2d4142 2f38adbe

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