From afb63c11ec1384a609c9981aa68a5037578b4a45 Mon Sep 17 00:00:00 2001 From: Michael Mikhail Date: Thu, 6 Jul 2023 19:23:39 +0000 Subject: [PATCH] Remove MEDIA_EXPLICIT_INDICATOR flag Fixes: 263512203 Test: atest MediaDataManagerTest Test: atest MediaControlPanelTest Test: Checked via an app that the explicit indicator is showing. Change-Id: I9991d02a82cac0688a08bc0a3f04a5706253edfe --- .../src/com/android/systemui/flags/Flags.kt | 3 --- .../media/controls/pipeline/MediaDataManager.kt | 13 +++++-------- .../systemui/media/controls/util/MediaFlags.kt | 3 --- .../media/controls/pipeline/MediaDataManagerTest.kt | 1 - .../media/controls/ui/MediaControlPanelTest.kt | 1 - 5 files changed, 5 insertions(+), 16 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index 6abe951d7f35b..9b1190f19fdfa 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -429,9 +429,6 @@ object Flags { // TODO(b/263272731): Tracking Bug val MEDIA_TTT_RECEIVER_SUCCESS_RIPPLE = releasedFlag(910, "media_ttt_receiver_success_ripple") - // TODO(b/263512203): Tracking Bug - val MEDIA_EXPLICIT_INDICATOR = releasedFlag(911, "media_explicit_indicator") - // TODO(b/265813373): Tracking Bug val MEDIA_TAP_TO_TRANSFER_DISMISS_GESTURE = releasedFlag(912, "media_ttt_dismiss_gesture") diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDataManager.kt b/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDataManager.kt index 6b993ce9e7bf6..0d493aaaae5db 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDataManager.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDataManager.kt @@ -716,8 +716,7 @@ class MediaDataManager( val appUid = currentEntry?.appUid ?: Process.INVALID_UID val isExplicit = desc.extras?.getLong(MediaConstants.METADATA_KEY_IS_EXPLICIT) == - MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT && - mediaFlags.isExplicitIndicatorEnabled() + MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT val progress = if (mediaFlags.isResumeProgressEnabled()) { @@ -826,12 +825,10 @@ class MediaDataManager( // Explicit Indicator var isExplicit = false - if (mediaFlags.isExplicitIndicatorEnabled()) { - val mediaMetadataCompat = MediaMetadataCompat.fromMediaMetadata(metadata) - isExplicit = - mediaMetadataCompat?.getLong(MediaConstants.METADATA_KEY_IS_EXPLICIT) == - MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT - } + val mediaMetadataCompat = MediaMetadataCompat.fromMediaMetadata(metadata) + isExplicit = + mediaMetadataCompat?.getLong(MediaConstants.METADATA_KEY_IS_EXPLICIT) == + MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT // Artist name var artist: CharSequence? = metadata?.getString(MediaMetadata.METADATA_KEY_ARTIST) diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaFlags.kt b/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaFlags.kt index 9bc66f6c98d02..01f047ccd4f56 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaFlags.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaFlags.kt @@ -43,9 +43,6 @@ class MediaFlags @Inject constructor(private val featureFlags: FeatureFlags) { */ fun areNearbyMediaDevicesEnabled() = featureFlags.isEnabled(Flags.MEDIA_NEARBY_DEVICES) - /** Check whether we show explicit indicator on UMO */ - fun isExplicitIndicatorEnabled() = featureFlags.isEnabled(Flags.MEDIA_EXPLICIT_INDICATOR) - /** * If true, keep active media controls for the lifetime of the MediaSession, regardless of * whether the underlying notification was dismissed diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaDataManagerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaDataManagerTest.kt index 56698e0ec41c2..d1299d40ea12c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaDataManagerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaDataManagerTest.kt @@ -261,7 +261,6 @@ class MediaDataManagerTest : SysuiTestCase() { whenever(mediaSmartspaceTarget.creationTimeMillis).thenReturn(SMARTSPACE_CREATION_TIME) whenever(mediaSmartspaceTarget.expiryTimeMillis).thenReturn(SMARTSPACE_EXPIRY_TIME) whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(false) - whenever(mediaFlags.isExplicitIndicatorEnabled()).thenReturn(true) whenever(mediaFlags.isRetainingPlayersEnabled()).thenReturn(false) whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(false) whenever(mediaFlags.isRemoteResumeAllowed()).thenReturn(false) diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaControlPanelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaControlPanelTest.kt index f902be3c1a29a..0bc47bbe90d24 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaControlPanelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaControlPanelTest.kt @@ -233,7 +233,6 @@ public class MediaControlPanelTest : SysuiTestCase() { FakeFeatureFlags().apply { this.set(Flags.UMO_SURFACE_RIPPLE, false) this.set(Flags.UMO_TURBULENCE_NOISE, false) - this.set(Flags.MEDIA_EXPLICIT_INDICATOR, true) this.set(Flags.MEDIA_RECOMMENDATION_CARD_UPDATE, false) } @Mock private lateinit var globalSettings: GlobalSettings