Merge cherrypicks of [15589380, 15589521, 15589522, 15589273, 15589503, 15589504, 15589505, 15589506, 15589507, 15589508, 15589509, 15589510, 15589511, 15589274, 15589562, 15589523, 15589405, 15589406, 15589581, 15589524, 15589525, 15589526, 15589276, 15589277, 15589565, 15589566, 15589528, 15589407, 15589255, 15589516, 15589530, 15589531, 15589569, 15589258] into sc-releaseandroid-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r1android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-platform-12.0.0_r1android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-release

Change-Id: If01f97b6f56e771a8964613ba751311ffe5ef880

1 files 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 -> {