From b72cf990447c9cd0f5367d788a72c8a61faa4d1b Mon Sep 17 00:00:00 2001
From: Stevie Kideckel <kideckel@google.com>
Date: Thu, 10 Jun 2021 09:59:01 +0000
Subject: [PATCH] Ensure that the RemoteResponse is not empty before acting on
 it

Potential NPE was added in ag/14881530

Fix: 190353630
Test: locally with sample app with and without items
Change-Id: I946b6b6719600cb638db1b15d74a8c3af6587f32
---
 core/java/android/widget/RemoteViews.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java
index 73d56daab6fbf..8a044fd06dd57 100644
--- 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);