summaryrefslogtreecommitdiff
path: root/packages/SystemUI/src
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2025-03-22 08:42:58 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2025-03-22 08:42:58 -0700
commit9415d45591e9aea494011599a0fe7cec888ce498 (patch)
tree810344058db8b2a94fd0e057f65bca3b4d029dea /packages/SystemUI/src
parentaea2061ed9e6f8039d56e8115445c019f0bbdd87 (diff)
parent546388d84afc0a5e320c5e98abe54732e97e7962 (diff)
Merge "Clean media_controls_posts_optimization flag" into main
Diffstat (limited to 'packages/SystemUI/src')
-rw-r--r--packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaProcessingHelper.kt3
-rw-r--r--packages/SystemUI/src/com/android/systemui/media/controls/ui/viewmodel/SeekBarViewModel.kt2
2 files changed, 1 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaProcessingHelper.kt b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaProcessingHelper.kt
index df0e1adee968..2e0e3a78c5b7 100644
--- a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaProcessingHelper.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaProcessingHelper.kt
@@ -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 &&
diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/viewmodel/SeekBarViewModel.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/viewmodel/SeekBarViewModel.kt
index 78a8cf8e9432..6175b6e47b52 100644
--- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/viewmodel/SeekBarViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/viewmodel/SeekBarViewModel.kt
@@ -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)