Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e38bfd9 authored by Fangqiu Su's avatar Fangqiu Su Committed by Android (Google) Code Review
Browse files

Merge "Update the imports to androidx.test.filters.*" into main

parents f2b47f64 d60934a4

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java

+5 −4
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 


package com.android.mediaframeworktest.functional;



import com.android.mediaframeworktest.MediaFrameworkTest;

import com.android.mediaframeworktest.MediaNames;



import android.content.Context;

import android.hardware.Camera;

import android.hardware.Camera.PictureCallback;
@@ -27,10 +24,14 @@ import android.hardware.Camera.ShutterCallback; 
import android.os.ConditionVariable;

import android.os.Looper;

import android.test.ActivityInstrumentationTestCase;

import android.test.suitebuilder.annotation.LargeTest;

import android.util.Log;

import android.view.SurfaceHolder;



import androidx.test.filters.LargeTest;



import com.android.mediaframeworktest.MediaFrameworkTest;

import com.android.mediaframeworktest.MediaNames;



import java.io.*;



/**

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMetadataTest.java

+2 −1
Original line number Diff line number Diff line
@@ -18,9 +18,10 @@ package com.android.mediaframeworktest.functional; 


import android.media.MediaMetadataRetriever;

import android.test.AndroidTestCase;

import android.test.suitebuilder.annotation.MediumTest;

import android.util.Log;



import androidx.test.filters.MediumTest;



import com.android.mediaframeworktest.MediaNames;

import com.android.mediaframeworktest.MediaProfileReader;

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMimeTest.java

+6 −7
Original line number Diff line number Diff line
@@ -16,21 +16,20 @@ 


package com.android.mediaframeworktest.functional;



import java.io.File;



import android.content.Context;

import android.content.Intent;

import android.content.pm.ActivityInfo;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.net.Uri;

import android.test.ActivityInstrumentationTestCase2;

import android.test.suitebuilder.annotation.LargeTest;

import android.test.suitebuilder.annotation.MediumTest;

import android.test.suitebuilder.annotation.Suppress;

import android.util.Log;



import androidx.test.filters.MediumTest;

import androidx.test.filters.Suppress;



import com.android.mediaframeworktest.MediaFrameworkTest;



import java.io.File;



/*

 * System tests for the handling of mime type in the media framework.

 *

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerInvokeTest.java

+6 −9
Original line number Diff line number Diff line
@@ -16,17 +16,14 @@ 


package com.android.mediaframeworktest.functional;



import com.android.mediaframeworktest.MediaFrameworkTest;

import com.android.mediaframeworktest.MediaNames;



import android.test.ActivityInstrumentationTestCase2;

import android.util.Log;

import android.test.suitebuilder.annotation.LargeTest;

import android.test.suitebuilder.annotation.MediumTest;

import android.test.suitebuilder.annotation.Suppress;



import android.media.MediaPlayer;

import android.os.Parcel;

import android.test.ActivityInstrumentationTestCase2;



import androidx.test.filters.MediumTest;

import androidx.test.filters.Suppress;



import com.android.mediaframeworktest.MediaFrameworkTest;



import java.util.Calendar;

import java.util.Random;

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaAudioEffectTest.java

+10 −12
Original line number Diff line number Diff line
@@ -16,28 +16,26 @@ 


package com.android.mediaframeworktest.functional.audio;



import com.android.mediaframeworktest.MediaFrameworkTest;

import com.android.mediaframeworktest.MediaNames;

import android.content.res.AssetFileDescriptor;

import android.media.audiofx.AudioEffect;

import android.media.AudioFormat;

import android.media.AudioManager;

import android.media.AudioTrack;

import android.media.AudioRecord;

import android.media.audiofx.EnvironmentalReverb;

import android.media.audiofx.Equalizer;

import android.media.AudioTrack;

import android.media.MediaPlayer;

import android.media.MediaRecorder;



import android.media.audiofx.AudioEffect;

import android.media.audiofx.EnvironmentalReverb;

import android.media.audiofx.Equalizer;

import android.os.Looper;

import android.test.suitebuilder.annotation.LargeTest;

import android.test.suitebuilder.annotation.MediumTest;

import android.test.suitebuilder.annotation.Suppress;

import android.test.ActivityInstrumentationTestCase2;

import android.util.Log;



import java.nio.ByteOrder;

import androidx.test.filters.LargeTest;



import com.android.mediaframeworktest.MediaFrameworkTest;

import com.android.mediaframeworktest.MediaNames;



import java.nio.ByteBuffer;

import java.nio.ByteOrder;

import java.util.UUID;



/**