Commit fa7ad70a authored Sep 23, 2021 by Cecilia Hong Committed by Automerger Merge Worker Sep 23, 2021

Merge "Sets media recommendations's isPlaying status to false instead of null...

Merge "Sets media recommendations's isPlaying status to false instead of null so the card sorting can be consistent." into sc-qpr1-dev am: 9abebd21 am: d3335c5e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15844857

Change-Id: I060d3d275332821429a89fdcda9dc73bd41c3ce4

packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -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