Merge "Clean media_controls_posts_optimization flag" into main (9415d455) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −7

Original line number	Diff line number	Diff line
		@@ -1392,13 +1392,6 @@ flag {
		}
		}

		flag {
		name: "media_controls_posts_optimization"
		namespace: "systemui"
		description: "Ignore duplicate media notifications posted"
		bug: "358645640"
		}

		flag {
		name: "media_controls_umo_inflation_in_background"
		namespace: "systemui"

packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaProcessingHelper.kt

+1 −2

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import android.media.session.MediaController
		import android.media.session.PlaybackState
		import android.os.BadParcelableException
		import android.util.Log
		import com.android.systemui.Flags.mediaControlsPostsOptimization
		import com.android.systemui.biometrics.Utils.toBitmap
		import com.android.systemui.media.controls.shared.model.MediaData

		@@ -45,7 +44,7 @@ fun isSameMediaData(
		new: MediaData,
		old: MediaData?,
		): Boolean {
		if (old == null \|\| !mediaControlsPostsOptimization()) return false
		if (old == null) return false

		return new.userId == old.userId &&
		new.app == old.app &&

packages/SystemUI/src/com/android/systemui/media/controls/ui/viewmodel/SeekBarViewModel.kt

+0 −2

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ import androidx.annotation.WorkerThread
		import androidx.core.view.GestureDetectorCompat
		import androidx.lifecycle.LiveData
		import androidx.lifecycle.MutableLiveData
		import com.android.systemui.Flags
		import com.android.systemui.classifier.Classifier.MEDIA_SEEKBAR
		import com.android.systemui.dagger.qualifiers.Background
		import com.android.systemui.media.NotificationMediaManager
		@@ -151,7 +150,6 @@ constructor(
		}

		override fun onMetadataChanged(metadata: MediaMetadata?) {
		if (!Flags.mediaControlsPostsOptimization()) return
		val (enabled, duration) = getEnabledStateAndDuration(metadata)
		if (_data.duration != duration) {
		_data = _data.copy(enabled = enabled, duration = duration)

packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImplTest.kt

+0 −22

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ import android.media.session.PlaybackState
		import android.net.Uri
		import android.os.Bundle
		import android.platform.test.annotations.DisableFlags
		import android.platform.test.annotations.EnableFlags
		import android.platform.test.flag.junit.FlagsParameterization
		import android.service.notification.StatusBarNotification
		import android.testing.TestableLooper.RunWithLooper
		@@ -2117,7 +2116,6 @@ class LegacyMediaDataManagerImplTest(flags: FlagsParameterization) : SysuiTestCa
		}

		@Test
		@EnableFlags(Flags.FLAG_MEDIA_CONTROLS_POSTS_OPTIMIZATION)
		fun postDuplicateNotification_doesNotCallListeners() {
		addNotificationAndLoad()
		reset(listener)
		@@ -2137,26 +2135,6 @@ class LegacyMediaDataManagerImplTest(flags: FlagsParameterization) : SysuiTestCa
		}

		@Test
		@DisableFlags(Flags.FLAG_MEDIA_CONTROLS_POSTS_OPTIMIZATION)
		fun postDuplicateNotification_callsListeners() {
		addNotificationAndLoad()
		reset(listener)
		mediaDataManager.onNotificationAdded(KEY, mediaNotification)
		testScope.assertRunAllReady(foreground = 1, background = 1)
		verify(listener)
		.onMediaDataLoaded(
		eq(KEY),
		eq(KEY),
		capture(mediaDataCaptor),
		eq(true),
		eq(0),
		eq(false),
		)
		verify(kosmos.mediaLogger, never()).logDuplicateMediaNotification(eq(KEY))
		}

		@Test
		@EnableFlags(Flags.FLAG_MEDIA_CONTROLS_POSTS_OPTIMIZATION)
		fun postDifferentIntentNotifications_CallsListeners() {
		addNotificationAndLoad()
		reset(listener)

packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessorTest.kt

+0 −26

Original line number	Diff line number	Diff line
		@@ -2201,7 +2201,6 @@ class MediaDataProcessorTest(flags: FlagsParameterization) : SysuiTestCase() {
		}

		@Test
		@EnableFlags(Flags.FLAG_MEDIA_CONTROLS_POSTS_OPTIMIZATION)
		fun postDuplicateNotification_doesNotCallListeners() {
		whenever(notificationLockscreenUserManager.isCurrentProfile(USER_ID)).thenReturn(true)
		whenever(notificationLockscreenUserManager.isProfileAvailable(USER_ID)).thenReturn(true)
		@@ -2226,31 +2225,6 @@ class MediaDataProcessorTest(flags: FlagsParameterization) : SysuiTestCase() {
		}

		@Test
		@DisableFlags(Flags.FLAG_MEDIA_CONTROLS_POSTS_OPTIMIZATION)
		fun postDuplicateNotification_callsListeners() {
		whenever(notificationLockscreenUserManager.isCurrentProfile(USER_ID)).thenReturn(true)
		whenever(notificationLockscreenUserManager.isProfileAvailable(USER_ID)).thenReturn(true)

		mediaDataProcessor.addInternalListener(mediaDataFilter)
		mediaDataFilter.mediaDataProcessor = mediaDataProcessor
		addNotificationAndLoad()
		reset(listener)
		mediaDataProcessor.onNotificationAdded(KEY, mediaNotification)
		testScope.assertRunAllReady(foreground = 1, background = 1)
		verify(listener)
		.onMediaDataLoaded(
		eq(KEY),
		eq(KEY),
		capture(mediaDataCaptor),
		eq(true),
		eq(0),
		eq(false),
		)
		verify(kosmos.mediaLogger, never()).logDuplicateMediaNotification(eq(KEY))
		}

		@Test
		@EnableFlags(Flags.FLAG_MEDIA_CONTROLS_POSTS_OPTIMIZATION)
		fun postDifferentIntentNotifications_CallsListeners() {
		whenever(notificationLockscreenUserManager.isCurrentProfile(USER_ID)).thenReturn(true)
		whenever(notificationLockscreenUserManager.isProfileAvailable(USER_ID)).thenReturn(true)