Fix issue 3022800.
Created sub-package android.media.audiofx for audio effects.
Change-Id: I63e1b110a3a07d4eb5fe93d4c2217a0251f9b924
diff --git a/tests/tests/media/src/android/media/cts/AudioEffectTest.java b/tests/tests/media/src/android/media/cts/AudioEffectTest.java
index 3d458c4..514f6a7 100644
--- a/tests/tests/media/src/android/media/cts/AudioEffectTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioEffectTest.java
@@ -19,13 +19,13 @@
import com.android.cts.stub.R;
import android.content.res.AssetFileDescriptor;
-import android.media.AudioEffect;
+import android.media.audiofx.AudioEffect;
import android.media.AudioFormat;
import android.media.AudioManager;
import android.media.AudioTrack;
-import android.media.PresetReverb;
-import android.media.EnvironmentalReverb;
-import android.media.Equalizer;
+import android.media.audiofx.PresetReverb;
+import android.media.audiofx.EnvironmentalReverb;
+import android.media.audiofx.Equalizer;
import android.media.MediaPlayer;
import android.os.Looper;
@@ -92,15 +92,15 @@
boolean hasPresetReverb = false;
for (int i = 0; i < desc.length; i++) {
- if (desc[i].mType.equals(AudioEffect.EFFECT_TYPE_EQUALIZER)) {
+ if (desc[i].type.equals(AudioEffect.EFFECT_TYPE_EQUALIZER)) {
hasEQ = true;
- } else if (desc[i].mType.equals(AudioEffect.EFFECT_TYPE_BASS_BOOST)) {
+ } else if (desc[i].type.equals(AudioEffect.EFFECT_TYPE_BASS_BOOST)) {
hasBassBoost = true;
- } else if (desc[i].mType.equals(AudioEffect.EFFECT_TYPE_VIRTUALIZER)) {
+ } else if (desc[i].type.equals(AudioEffect.EFFECT_TYPE_VIRTUALIZER)) {
hasVirtualizer = true;
- } else if (desc[i].mType.equals(AudioEffect.EFFECT_TYPE_ENV_REVERB)) {
+ } else if (desc[i].type.equals(AudioEffect.EFFECT_TYPE_ENV_REVERB)) {
hasEnvReverb = true;
- } else if (desc[i].mType.equals(AudioEffect.EFFECT_TYPE_PRESET_REVERB)) {
+ } else if (desc[i].type.equals(AudioEffect.EFFECT_TYPE_PRESET_REVERB)) {
hasPresetReverb = true;
}
}
@@ -138,7 +138,7 @@
assertTrue("no effects found", (desc.length != 0));
for (int i = 0; i < desc.length; i++) {
try {
- AudioEffect effect = new AudioEffect(desc[i].mType,
+ AudioEffect effect = new AudioEffect(desc[i].type,
AudioEffect.EFFECT_TYPE_NULL,
0,
0);
@@ -151,7 +151,7 @@
effect.release();
}
} catch (IllegalArgumentException e) {
- fail("Effect not found: "+desc[i].mName);
+ fail("Effect not found: "+desc[i].name);
} catch (UnsupportedOperationException e) {
fail("Effect library not loaded");
}
@@ -182,7 +182,7 @@
for (int i = 0; i < desc.length; i++) {
try {
AudioEffect effect = new AudioEffect(AudioEffect.EFFECT_TYPE_NULL,
- desc[i].mUuid,
+ desc[i].uuid,
0,
0);
assertNotNull("could not create AudioEffect", effect);
@@ -194,7 +194,7 @@
effect.release();
}
} catch (IllegalArgumentException e) {
- fail("Effect not found: "+desc[i].mName);
+ fail("Effect not found: "+desc[i].name);
} catch (UnsupportedOperationException e) {
fail("Effect library not loaded");
}
diff --git a/tests/tests/media/src/android/media/cts/BassBoostTest.java b/tests/tests/media/src/android/media/cts/BassBoostTest.java
index d0b16e4..9cea0b0 100644
--- a/tests/tests/media/src/android/media/cts/BassBoostTest.java
+++ b/tests/tests/media/src/android/media/cts/BassBoostTest.java
@@ -16,10 +16,10 @@
package android.media.cts;
-import android.media.AudioEffect;
+import android.media.audiofx.AudioEffect;
import android.media.AudioFormat;
import android.media.AudioManager;
-import android.media.BassBoost;
+import android.media.audiofx.BassBoost;
import android.os.Looper;
import android.test.AndroidTestCase;
import android.util.Log;
diff --git a/tests/tests/media/src/android/media/cts/EnvReverbTest.java b/tests/tests/media/src/android/media/cts/EnvReverbTest.java
index 3854048..fe7baf9 100644
--- a/tests/tests/media/src/android/media/cts/EnvReverbTest.java
+++ b/tests/tests/media/src/android/media/cts/EnvReverbTest.java
@@ -16,10 +16,10 @@
package android.media.cts;
-import android.media.AudioEffect;
+import android.media.audiofx.AudioEffect;
import android.media.AudioFormat;
import android.media.AudioManager;
-import android.media.EnvironmentalReverb;
+import android.media.audiofx.EnvironmentalReverb;
import android.os.Looper;
import android.test.AndroidTestCase;
import android.util.Log;
diff --git a/tests/tests/media/src/android/media/cts/EqualizerTest.java b/tests/tests/media/src/android/media/cts/EqualizerTest.java
index 967a281..4b63828 100644
--- a/tests/tests/media/src/android/media/cts/EqualizerTest.java
+++ b/tests/tests/media/src/android/media/cts/EqualizerTest.java
@@ -16,10 +16,10 @@
package android.media.cts;
-import android.media.AudioEffect;
+import android.media.audiofx.AudioEffect;
import android.media.AudioFormat;
import android.media.AudioManager;
-import android.media.Equalizer;
+import android.media.audiofx.Equalizer;
import android.os.Looper;
import android.test.AndroidTestCase;
import android.util.Log;
diff --git a/tests/tests/media/src/android/media/cts/PresetReverbTest.java b/tests/tests/media/src/android/media/cts/PresetReverbTest.java
index e29192b..a1b05bd 100644
--- a/tests/tests/media/src/android/media/cts/PresetReverbTest.java
+++ b/tests/tests/media/src/android/media/cts/PresetReverbTest.java
@@ -16,10 +16,10 @@
package android.media.cts;
-import android.media.AudioEffect;
+import android.media.audiofx.AudioEffect;
import android.media.AudioFormat;
import android.media.AudioManager;
-import android.media.PresetReverb;
+import android.media.audiofx.PresetReverb;
import android.os.Looper;
import android.test.AndroidTestCase;
import android.util.Log;
diff --git a/tests/tests/media/src/android/media/cts/VirtualizerTest.java b/tests/tests/media/src/android/media/cts/VirtualizerTest.java
index 07f8894..0a82f09 100644
--- a/tests/tests/media/src/android/media/cts/VirtualizerTest.java
+++ b/tests/tests/media/src/android/media/cts/VirtualizerTest.java
@@ -16,10 +16,10 @@
package android.media.cts;
-import android.media.AudioEffect;
+import android.media.audiofx.AudioEffect;
import android.media.AudioFormat;
import android.media.AudioManager;
-import android.media.Virtualizer;
+import android.media.audiofx.Virtualizer;
import android.os.Looper;
import android.test.AndroidTestCase;
import android.util.Log;
diff --git a/tests/tests/media/src/android/media/cts/VisualizerTest.java b/tests/tests/media/src/android/media/cts/VisualizerTest.java
index d23be3f..6b29948 100644
--- a/tests/tests/media/src/android/media/cts/VisualizerTest.java
+++ b/tests/tests/media/src/android/media/cts/VisualizerTest.java
@@ -16,10 +16,10 @@
package android.media.cts;
-import android.media.AudioEffect;
+import android.media.audiofx.AudioEffect;
import android.media.AudioFormat;
import android.media.AudioManager;
-import android.media.Visualizer;
+import android.media.audiofx.Visualizer;
import android.os.Looper;
import android.test.AndroidTestCase;
import android.util.Log;
