Snap for 4716599 from 8c1462e7aaa3d944c4ae821e7907dcb642b056a9 to pi-release

Change-Id: I84c2740ade423787c3ee7fa6ad79635e6bf981c1

1 files changed, 3 insertions, 1 deletions

diff --git a/src/com/android/car/media/PlaybackFragment.java b/src/com/android/car/media/PlaybackFragment.java
index bf1e9ec..4217488 100644
--- a/src/com/android/car/media/PlaybackFragment.java
+++ b/src/com/android/car/media/PlaybackFragment.java
@@ -174,7 +174,8 @@ public class PlaybackFragment extends Fragment implements PlaybackModel.Playback
 
     private void updateAccentColor() {
         int defaultColor = getResources().getColor(android.R.color.background_dark, null);
-        int color = mModel.getMediaSource().getAccentColor(defaultColor);
+        MediaSource mediaSource = mModel.getMediaSource();
+        int color = mediaSource == null ? defaultColor : mediaSource.getAccentColor(defaultColor);
         mSeekbar.getProgressDrawable().setColorFilter(color, PorterDuff.Mode.SRC_IN);
     }
 
@@ -221,6 +222,7 @@ public class PlaybackFragment extends Fragment implements PlaybackModel.Playback
             mMediaSource.unsubscribe(this);
         }
         mMediaSource = newSource;
+        if (newSource == null) return;
         mMediaSource.subscribe(this);
         MediaManager.getInstance(getContext())
                 .setMediaClientComponent(mMediaSource.getBrowseServiceComponentName());