Merge "Don't display UI when playback state is STATE_NONE" into pi-car-dev
diff --git a/car-media-common/src/com/android/car/media/common/playback/PlaybackViewModel.java b/car-media-common/src/com/android/car/media/common/playback/PlaybackViewModel.java
index e4ed555..5a655ef 100644
--- a/car-media-common/src/com/android/car/media/common/playback/PlaybackViewModel.java
+++ b/car-media-common/src/com/android/car/media/common/playback/PlaybackViewModel.java
@@ -335,7 +335,9 @@
/** Returns true if there's enough information in the state to show a UI for it. */
public boolean shouldDisplay() {
- return (mMetadata != null) || (getMainAction() != ACTION_DISABLED);
+ // STATE_NONE means no content to play.
+ return mState.getState() != PlaybackStateCompat.STATE_NONE && ((mMetadata != null) || (
+ getMainAction() != ACTION_DISABLED));
}
/** Returns the main action. */