From 0947bda1d68991e6cb263e72f2b496fdf4656f6d Mon Sep 17 00:00:00 2001
From: Simon Dai <sdai@google.com>
Date: Tue, 2 Apr 2019 15:48:34 -0700
Subject: Fix crashes in Media Center

Fix tapping on subheaders resulting in NPE
Prevent repeated taps on back arrow while animating

Fixes: 129781969
Fixes: 129783392
Test: Manual
Change-Id: Ia29377648a3fd01b0fcb7388d099d660ac8f8bfc
---
 src/com/android/car/media/browse/BrowseAdapter.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/com/android/car/media/browse')

diff --git a/src/com/android/car/media/browse/BrowseAdapter.java b/src/com/android/car/media/browse/BrowseAdapter.java
index 8fe4ba3..cac9998 100644
--- a/src/com/android/car/media/browse/BrowseAdapter.java
+++ b/src/com/android/car/media/browse/BrowseAdapter.java
@@ -231,8 +231,10 @@ public class BrowseAdapter extends ListAdapter<BrowseViewData, BrowseViewHolder>
             if (title == null) {
                 title = "";
             }
-            result.add(new BrowseViewData(title, BrowseItemViewType.HEADER,
-                    view -> BrowseAdapter.this.notify(notification)));
+            View.OnClickListener listener = notification != null ?
+                    view -> BrowseAdapter.this.notify(notification) :
+                    null;
+            result.add(new BrowseViewData(title, BrowseItemViewType.HEADER, listener));
         }
 
         List<BrowseViewData> build() {
-- 
cgit v1.2.3