Merge "Sync clean up for Spatial audio classes from tm-dev to master"

This commit is contained in:
Jenhou (Alan) Huang
2022-03-24 07:11:14 +00:00
committed by Android (Google) Code Review
7 changed files with 7 additions and 38 deletions

View File

@@ -31,7 +31,6 @@ import android.media.Spatializer;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
@@ -42,7 +41,7 @@ public class SpatialAudioParentPreferenceControllerTest {
private static final String KEY = "spatial_audio_summary";
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@Mock
private Context mContext;
@Mock
private AudioManager mAudioManager;

View File

@@ -56,7 +56,7 @@ public class SpatialAudioPreferenceControllerTest {
mContext = spy(RuntimeEnvironment.application);
when(mContext.getSystemService(AudioManager.class)).thenReturn(mAudioManager);
when(mAudioManager.getSpatializer()).thenReturn(mSpatializer);
mController = new SpatialAudioPreferenceController(mContext);
mController = new SpatialAudioPreferenceController(mContext, "unused");
}
@Test

View File

@@ -56,7 +56,7 @@ public class SpatialAudioWiredHeadphonesPreferenceControllerTest {
mContext = spy(RuntimeEnvironment.application);
when(mContext.getSystemService(AudioManager.class)).thenReturn(mAudioManager);
when(mAudioManager.getSpatializer()).thenReturn(mSpatializer);
mController = new SpatialAudioWiredHeadphonesController(mContext);
mController = new SpatialAudioWiredHeadphonesController(mContext, "unused");
}
@Test