Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b7480a6 authored by Michael Mikhail's avatar Michael Mikhail Committed by Android (Google) Code Review
Browse files

Merge "Ensure UMO is added to current media" into main

parents d4204885 3eb8fb43

packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/data/repository/MediaFilterRepositoryTest.kt

+0 −1
Original line number Diff line number Diff line
@@ -152,7 +152,6 @@ class MediaFilterRepositoryTest : SysuiTestCase() { 
            underTest.setRecommendation(mediaRecommendation.copy(isActive = false))



            assertThat(smartspaceMediaData).isNotEqualTo(mediaRecommendation)

            assertThat(smartspaceMediaData?.isActive).isFalse()

            assertThat(underTest.isRecommendationActive()).isFalse()

        }

packages/SystemUI/src/com/android/systemui/media/controls/data/repository/MediaFilterRepository.kt

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ constructor( 
                        mediaFromRecPackageName = null

                        _currentMedia.value = sortedMap.values.toList()

                    }

                } else if (sortedMap.size > sortedMedia.size && it.active) {

                } else if (sortedMap.size > _currentMedia.value.size && it.active) {

                    _currentMedia.value = sortedMap.values.toList()

                } else {

                    // When loading an update for an existing media control.