commit f1431332254fc67892ec6432e27399c1a7bf69d2
author Zim <zezeozue@google.com> Wed Aug 11 09:29:26 2021 +0100
committer Zimuzo Ezeozue <zezeozue@google.com> Wed Aug 11 10:08:36 2021 +0000
tree 1da89bbf230c5e57a0d0368b017f831892380cee
parent 51f5048a0ac2ca82a6388c7a5d09e2fe884792fc

Rename MediaTranscodeManager -> MediaTranscodingManager

renamed to avoid conflict with existing copy in the R framework.jar.
The framework.jar copy was removed during S development

Bug: 195608856
Test: pending
Change-Id: If54927a664ae32f9a3328c40906bdce59e6d6a73

src/com/android/providers/media/TranscodeHelperImpl.java

diff --git a/src/com/android/providers/media/TranscodeHelperImpl.java b/src/com/android/providers/media/TranscodeHelperImpl.java
index 588792d..8017a59 100644
--- a/src/com/android/providers/media/TranscodeHelperImpl.java
+++ b/src/com/android/providers/media/TranscodeHelperImpl.java
@@ -54,10 +54,10 @@
 import android.media.ApplicationMediaCapabilities;
 import android.media.MediaFeature;
 import android.media.MediaFormat;
-import android.media.MediaTranscodeManager;
-import android.media.MediaTranscodeManager.VideoTranscodingRequest;
-import android.media.MediaTranscodeManager.TranscodingRequest.VideoFormatResolver;
-import android.media.MediaTranscodeManager.TranscodingSession;
+import android.media.MediaTranscodingManager;
+import android.media.MediaTranscodingManager.VideoTranscodingRequest;
+import android.media.MediaTranscodingManager.TranscodingRequest.VideoFormatResolver;
+import android.media.MediaTranscodingManager.TranscodingSession;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -1122,8 +1122,8 @@
     private TranscodingSession enqueueTranscodingSession(String src, String dst, int uid,
             final CountDownLatch latch) throws UnsupportedOperationException, IOException {
         // Fetch the service lazily to improve memory usage
-        final MediaTranscodeManager mediaTranscodeManager =
-                mContext.getSystemService(MediaTranscodeManager.class);
+        final MediaTranscodingManager mediaTranscodeManager =
+                mContext.getSystemService(MediaTranscodingManager.class);
         File file = new File(src);
         File transcodeFile = new File(dst);
 
@@ -1839,17 +1839,17 @@
         private final SparseArray<Long> mSessionStartTimes = new SparseArray<>();
 
         // Call this only in foreground thread.
-        private long getSessionStartTime(MediaTranscodeManager.TranscodingSession session) {
+        private long getSessionStartTime(MediaTranscodingManager.TranscodingSession session) {
             return mSessionStartTimes.get(session.getSessionId());
         }
 
-        private void logSessionStart(MediaTranscodeManager.TranscodingSession session) {
+        private void logSessionStart(MediaTranscodingManager.TranscodingSession session) {
             ForegroundThread.getHandler().post(
                     () -> mSessionStartTimes.append(session.getSessionId(),
                             System.currentTimeMillis()));
         }
 
-        private void logSessionEnd(MediaTranscodeManager.TranscodingSession session) {
+        private void logSessionEnd(MediaTranscodingManager.TranscodingSession session) {
             ForegroundThread.getHandler().post(
                     () -> mSessionStartTimes.remove(session.getSessionId()));
         }