Merge "Revert "CtsMediaTestCases: AudioEffects: takes initial state into account"" into android13-tests-dev

Author: Shunkai Yao

tests/tests/media/audio/src/android/media/audio/cts/AudioEffectTest.java

@@ -66,7 +66,6 @@ public class AudioEffectTest extends PostProcTestBase {
 
     @Override
     protected void tearDown() throws Exception {
-        super.tearDown();
         releaseEffect();
         terminateMediaPlayerLooper();
         terminateListenerLooper();
@@ -672,7 +671,6 @@ public void test4_0setEnabledLowerPriority() throws Exception {
             assertFalse("Effect1 has control", effect1.hasControl());
             assertTrue("Effect1 can enable",
                     effect1.setEnabled(true) == AudioEffect.ERROR_INVALID_OPERATION);
-            // Note: all effects under test are disabled at setup
             assertFalse("Effect1 has enabled", effect2.getEnabled());
 
         } catch (IllegalArgumentException e) {

tests/tests/media/common/src/android/media/cts/PostProcTestBase.java

@@ -23,14 +23,7 @@
 import android.os.Looper;
 import android.test.AndroidTestCase;
 
-import java.lang.Boolean;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
 public class PostProcTestBase extends AndroidTestCase {
-    private static final int CONTROL_PRIORITY = 100;
-
     protected int mSession = -1;
     protected boolean mHasControl = false;
     protected boolean mIsEnabled = false;
@@ -41,64 +34,6 @@ public class PostProcTestBase extends AndroidTestCase {
     protected final static String BUNDLE_VOLUME_EFFECT_UUID =
             "119341a0-8469-11df-81f9-0002a5d5c51b";
 
-    private Map<UUID, Boolean> mOriginalEffectState = new HashMap<>();
-
-    /**
-     * All potential effects under test are disabled at setup.
-     * Initial state is backuped, restored in tearDown
-     * @throws Exception
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        final UUID[] effectTypes = {
-                AudioEffect.EFFECT_TYPE_BASS_BOOST,
-                AudioEffect.EFFECT_TYPE_EQUALIZER,
-                AudioEffect.EFFECT_TYPE_VIRTUALIZER,
-                AudioEffect.EFFECT_TYPE_PRESET_REVERB,
-                AudioEffect.EFFECT_TYPE_ENV_REVERB,
-        };
-        for (UUID effectType : effectTypes) {
-            try {
-                if (AudioEffect.isEffectTypeAvailable(effectType)) {
-                    AudioEffect effect = new AudioEffect(effectType,
-                            AudioEffect.EFFECT_TYPE_NULL,
-                            CONTROL_PRIORITY,
-                            0);
-                    assertTrue("effect does not have control", effect.hasControl());
-                    mOriginalEffectState.put(effectType, effect.getEnabled());
-
-                    effect.setEnabled(false);
-                    assertFalse("Could not disable effect", effect.getEnabled());
-                    effect.release();
-                }
-            } catch (IllegalStateException e) {
-            } catch (IllegalArgumentException e) {
-            } catch (UnsupportedOperationException e) {
-            }
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        for (Map.Entry<UUID, Boolean> entry : mOriginalEffectState.entrySet()) {
-            try {
-                AudioEffect effect = new AudioEffect(entry.getKey(),
-                        AudioEffect.EFFECT_TYPE_NULL,
-                        CONTROL_PRIORITY,
-                        0);
-                assertTrue("effect does not have control", effect.hasControl());
-                effect.setEnabled(entry.getValue());
-                effect.release();
-            } catch (IllegalStateException e) {
-            } catch (IllegalArgumentException e) {
-            } catch (UnsupportedOperationException e) {
-            }
-        }
-    }
-
     protected boolean hasAudioOutput() {
         return getContext().getPackageManager().hasSystemFeature(
                 PackageManager.FEATURE_AUDIO_OUTPUT);