From cb70c6439a209ab09ad2cdcf420c416753c6d886 Mon Sep 17 00:00:00 2001
From: Arnaud Berry <arnaudberry@google.com>
Date: Mon, 6 Dec 2021 15:18:30 -0800
Subject: Prevent NPE in MediaActivityController

Fixes: 209213934
Test: compiles
Change-Id: Iad54fbe85c8e01d88c13017079ff02faad825955
---
 src/com/android/car/media/MediaActivityController.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/car/media/MediaActivityController.java b/src/com/android/car/media/MediaActivityController.java
index efe1d3d..a29b40d 100644
--- a/src/com/android/car/media/MediaActivityController.java
+++ b/src/com/android/car/media/MediaActivityController.java
@@ -205,6 +205,10 @@ public class MediaActivityController extends ViewControllerBase {
     }
 
     private void onMediaBrowsingStateChanged(BrowsingState newBrowsingState) {
+        if (newBrowsingState == null) {
+            Log.e(TAG, "Null browsing state (no media source!)");
+            return;
+        }
         switch (newBrowsingState.mConnectionStatus) {
             case CONNECTING:
                 break;
-- 
cgit v1.2.3