diff options
| author | 2024-11-19 21:29:43 +0000 | |
|---|---|---|
| committer | 2024-11-19 21:29:43 +0000 | |
| commit | 03e5fb05ca2a0ea7603ddf9dbe8cba8e07c15a8e (patch) | |
| tree | 5c7af6fa5eb9118a66cafee156cedfa1a8457148 | |
| parent | 13e05e639e37fc02c9650153232e5198f803e0bf (diff) | |
| parent | 0fee6810b816249388e44f630648a9e5316c1156 (diff) | |
Merge "[ProgressStyle] do visitor check when extras is available" into main
| -rw-r--r-- | core/java/android/app/Notification.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index fcf886bc376e..b84c91b8276b 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -3160,12 +3160,16 @@ public class Notification implements Parcelable callPerson.visitUris(visitor); } visitIconUri(visitor, extras.getParcelable(EXTRA_VERIFICATION_ICON, Icon.class)); - } - if (Flags.apiRichOngoing()) { - visitIconUri(visitor, extras.getParcelable(EXTRA_PROGRESS_TRACKER_ICON, Icon.class)); - visitIconUri(visitor, extras.getParcelable(EXTRA_PROGRESS_START_ICON, Icon.class)); - visitIconUri(visitor, extras.getParcelable(EXTRA_PROGRESS_END_ICON, Icon.class)); + + if (Flags.apiRichOngoing()) { + visitIconUri(visitor, extras.getParcelable(EXTRA_PROGRESS_TRACKER_ICON, + Icon.class)); + visitIconUri(visitor, extras.getParcelable(EXTRA_PROGRESS_START_ICON, + Icon.class)); + visitIconUri(visitor, extras.getParcelable(EXTRA_PROGRESS_END_ICON, + Icon.class)); + } } if (mBubbleMetadata != null) { |