commit fe4c2970542d2499524a7471d35658218e348cea
author Andrew Lewis <andrewlewis@google.com> Sat Apr 08 16:46:05 2023 +0000
committer Andrew Lewis <andrewlewis@google.com> Sun Apr 09 12:16:39 2023 +0000
tree 0f31659c70f15c3d91cb2a422d4863c5e11cc913
parent bfcf60f3f3d8c7d570031bf0c816b97d348f8aee

Fix transcode progress notification

The executor and listener fields are guarded by a lock, but the lock was
not taken out when notifying progress updates.

Test: Will be tested via MediaTranscodingManagerTest but it currently fails due to b/274472195
Fixes: 277383391
Change-Id: Ib8dce559d57564f6383c43bd1c9e2efedda7d92c

apex/framework/java/android/media/MediaTranscodingManager.java

diff --git a/apex/framework/java/android/media/MediaTranscodingManager.java b/apex/framework/java/android/media/MediaTranscodingManager.java
index 32f5b46..5a5ead5 100644
--- a/apex/framework/java/android/media/MediaTranscodingManager.java
+++ b/apex/framework/java/android/media/MediaTranscodingManager.java
@@ -190,16 +190,8 @@
                 return;
             }
 
-            // Updates the session progress.
+            // Update session progress and notify clients.
             session.updateProgress(newProgress);
-
-            // Notifies client the progress update.
-            if (session.mProgressUpdateExecutor != null
-                    && session.mProgressUpdateListener != null) {
-                session.mProgressUpdateExecutor.execute(
-                        () -> session.mProgressUpdateListener.onProgressUpdate(session,
-                                newProgress));
-            }
         }
     }
 
@@ -1663,6 +1655,11 @@
         private void updateProgress(int newProgress) {
             synchronized (mLock) {
                 mProgress = newProgress;
+                if (mProgressUpdateExecutor != null && mProgressUpdateListener != null) {
+                    final OnProgressUpdateListener listener = mProgressUpdateListener;
+                    mProgressUpdateExecutor.execute(
+                            () -> listener.onProgressUpdate(this, newProgress));
+                }
             }
         }