From 572c73aaab003b458b9f426190f676f20446bfbc Mon Sep 17 00:00:00 2001 From: Ray Essick Date: Tue, 10 Aug 2021 16:31:41 -0700 Subject: Rename android.media.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: build Test: cts-tradefed run cts -m CtsMediaTranscodingTestCases Change-Id: I6e9616b889f898fa9fa3e33a8bf379a77ca6fb72 (cherry picked from commit 0c4e053b454656496f02c51579b7be65a96d4f4e) --- .../stressmodes/BackgroundTranscodingStressTestMode.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/device-collectors/src/main/java/android/device/stressmodes/BackgroundTranscodingStressTestMode.java b/libraries/device-collectors/src/main/java/android/device/stressmodes/BackgroundTranscodingStressTestMode.java index b6d1c23d1..5ea3283d2 100644 --- a/libraries/device-collectors/src/main/java/android/device/stressmodes/BackgroundTranscodingStressTestMode.java +++ b/libraries/device-collectors/src/main/java/android/device/stressmodes/BackgroundTranscodingStressTestMode.java @@ -22,10 +22,10 @@ import android.media.ApplicationMediaCapabilities; import android.net.Uri; import android.util.Log; import android.media.MediaFormat; -import android.media.MediaTranscodeManager; -import android.media.MediaTranscodeManager.TranscodingRequest; -import android.media.MediaTranscodeManager.TranscodingSession; -import android.media.MediaTranscodeManager.VideoTranscodingRequest; +import android.media.MediaTranscodingManager; +import android.media.MediaTranscodingManager.TranscodingRequest; +import android.media.MediaTranscodingManager.TranscodingSession; +import android.media.MediaTranscodingManager.VideoTranscodingRequest; import static org.junit.Assert.assertNotNull; import androidx.test.InstrumentationRegistry; @@ -40,7 +40,7 @@ import java.util.concurrent.Executors; public class BackgroundTranscodingStressTestMode extends InstrumentationRunListener { private static final String TAG = BackgroundTranscodingStressTestMode.class.getSimpleName(); private Context mContext; - private MediaTranscodeManager mMediaTranscodeManager = null; + private MediaTranscodingManager mMediaTranscodingManager = null; // Default setting for transcoding to H.264. private static final String MIME_TYPE = MediaFormat.MIMETYPE_VIDEO_AVC; @@ -55,8 +55,8 @@ public class BackgroundTranscodingStressTestMode extends InstrumentationRunListe InstrumentationRegistry.getInstrumentation() .getUiAutomation() .adoptShellPermissionIdentity("android.permission.WRITE_MEDIA_STORAGE"); - mMediaTranscodeManager = mContext.getSystemService(MediaTranscodeManager.class); - assertNotNull(mMediaTranscodeManager); + mMediaTranscodingManager = mContext.getSystemService(MediaTranscodingManager.class); + assertNotNull(mMediaTranscodingManager); } @Override @@ -99,7 +99,7 @@ public class BackgroundTranscodingStressTestMode extends InstrumentationRunListe Log.d(TAG, "transcoding to format: " + videoTrackFormat); mTranscodingSession = - mMediaTranscodeManager.enqueueRequest( + mMediaTranscodingManager.enqueueRequest( request, listenerExecutor, transcodingSession -> { -- cgit v1.2.3