diff options
| author | 2021-06-10 09:59:01 +0000 | |
|---|---|---|
| committer | 2021-06-10 09:59:01 +0000 | |
| commit | b72cf990447c9cd0f5367d788a72c8a61faa4d1b (patch) | |
| tree | 87b68aa2988eaa44695e2e8740ca4eb933d0a80e | |
| parent | 50ae7cbf1bdd18a23c14b82037af9705c4524470 (diff) | |
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
| -rw-r--r-- | core/java/android/widget/RemoteViews.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index 73d56daab6fb..8a044fd06dd5 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); |