summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Berry <arnaudberry@google.com>2021-12-07 18:51:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-07 18:51:32 +0000
commit3b7b3f7e213673885940f3cfd642927152f28cda (patch)
tree79de42416ce3345daafa1ca9629d4ba4ba001a2c
parent164a7d08f93db9d09c9a3afa91152e099ce3e405 (diff)
parentcb70c6439a209ab09ad2cdcf420c416753c6d886 (diff)
downloadMedia-3b7b3f7e213673885940f3cfd642927152f28cda.tar.gz
Prevent NPE in MediaActivityController am: cb70c6439a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Media/+/16407745 Change-Id: I5089df61b25a6e4b4eef43e0882307b0cbe5ded5
-rw-r--r--src/com/android/car/media/MediaActivityController.java4
1 files changed, 4 insertions, 0 deletions
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;