summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Cecilia Hong <xiaotinghong@google.com> 2021-09-22 17:04:54 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-09-22 17:04:54 +0000
commit9abebd2175d38c327ef4f9e30213bf4aadd74b41 (patch)
tree67d6be2f40e61557a45cadba89fdf26287a5db41
parent5784ba0c389598afb094672586f294bac866d5a3 (diff)
parent55945b021bfa1b3dce56fb3abae987dbbea98e57 (diff)
Merge "Sets media recommendations's isPlaying status to false instead of null so the card sorting can be consistent." into sc-qpr1-dev
-rw-r--r--packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt b/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt
index db5dbb0263c8..4fef79c6abf5 100644
--- a/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt
@@ -857,7 +857,8 @@ internal object MediaPlayerData {
) {
shouldPrioritizeSs = shouldPrioritize
removeMediaPlayer(key)
- val sortKey = MediaSortKey(isSsMediaRec = true, EMPTY, clock.currentTimeMillis())
+ val sortKey = MediaSortKey(/* isSsMediaRec= */ true,
+ EMPTY.copy(isPlaying = false), clock.currentTimeMillis())
mediaData.put(key, sortKey)
mediaPlayers.put(sortKey, player)
smartspaceMediaData = data