Commit 54bdc4a5 authored May 09, 2023 by Ioana Alexandru

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

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

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



Change-Id: If7d3c9f0b79cfd9de0b9a3c0270e72fa234f4898
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents bd00ca84 fbbf6f75

core/java/android/app/Notification.java

+1 −1

Original line number	Original line	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) {		if (isStyle(CallStyle.class) & extras != null) {