Merge "Ensure seekbar description updates on main thread" into main

3 files changed, 10 insertions, 5 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/binder/SeekBarObserver.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/binder/SeekBarObserver.kt
index 5b65531cdd55..f81745704d2b 100644
--- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/binder/SeekBarObserver.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/binder/SeekBarObserver.kt
@@ -157,6 +157,7 @@ open class SeekBarObserver(private val holder: MediaViewHolder) :
         return DateUtils.formatElapsedTime(milliseconds / DateUtils.SECOND_IN_MILLIS)
     }
 
+    @UiThread
     fun updateContentDescription(
         elapsedTimeDescription: CharSequence,
         durationDescription: CharSequence,
diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaControlPanel.java b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaControlPanel.java
index f69985ee5364..9cf7356a0ab2 100644
--- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaControlPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaControlPanel.java
@@ -399,7 +399,9 @@ public class MediaControlPanel {
     }
 
     private void setSeekbarContentDescription(CharSequence elapsedTime, CharSequence duration) {
-        mSeekBarObserver.updateContentDescription(elapsedTime, duration);
+        mMainExecutor.execute(() -> {
+            mSeekBarObserver.updateContentDescription(elapsedTime, duration);
+        });
     }
 
     /**
diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaViewController.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaViewController.kt
index e87d5de56177..8c683e8f9749 100644
--- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaViewController.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaViewController.kt
@@ -236,10 +236,12 @@ constructor(
                 durationDescription: CharSequence,
             ) {
                 if (!SceneContainerFlag.isEnabled) return
-                seekBarObserver.updateContentDescription(
-                    elapsedTimeDescription,
-                    durationDescription,
-                )
+                mainExecutor.execute {
+                    seekBarObserver.updateContentDescription(
+                        elapsedTimeDescription,
+                        durationDescription,
+                    )
+                }
             }
         }