Merge "Ensure that the RemoteResponse is not empty before acting on it" into sc-dev

2021-06-11 16:39:15 +00:00
parent 893eb1203d b72cf99044
commit cf30f5dae2
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/widget/RemoteViews.java
+++ b/core/java/android/widget/RemoteViews.java
@@ -814,7 +814,9 @@ public class RemoteViews implements Parcelable, Filter {
                // The PendingIntent template is stored in the view's tag.
                OnItemClickListener listener = (parent, view, position, id) -> {
                    RemoteResponse response = findRemoteResponseTag(view);
-                    response.handleViewInteraction(view, handler);
+                    if (response != null) {
+                        response.handleViewInteraction(view, handler);
+                    }
                };
                av.setOnItemClickListener(listener);
                av.setTag(pendingIntentTemplate);