PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove DEVICE_OUT_ALL_SCO."

Browse Source 
am: ada1f6b10b

Change-Id: I01878a3b42900ff55b88e9c01705cd8b753388b5
This commit is contained in:
jiabin
2019-12-06 09:33:50 -08:00
committed by android-build-merger
parent 48388d0949 ada1f6b10b
commit 15d7195311
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.sound;
import static android.media.AudioSystem.DEVICE_OUT_ALL_SCO;
import static android.media.AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_HEADSET;
import static android.media.AudioSystem.STREAM_MUSIC;
@@ -45,7 +44,6 @@ import androidx.preference.ListPreference;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.bluetooth.Utils;
import com.android.settings.core.FeatureFlags;
import com.android.settings.testutils.shadow.ShadowAudioManager;
@@ -66,7 +64,6 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowBluetoothDevice;
@@ -246,7 +243,8 @@ public class AudioOutputSwitchPreferenceControllerTest {
public void isStreamFromOutputDevice_outputDeviceIsBtScoHeadset_shouldReturnTrue() {
mShadowAudioManager.setOutputDevice(DEVICE_OUT_BLUETOOTH_SCO_HEADSET);
assertThat(mController.isStreamFromOutputDevice(STREAM_MUSIC, DEVICE_OUT_ALL_SCO)).isTrue();
assertThat(mController.isStreamFromOutputDevice(
STREAM_MUSIC, DEVICE_OUT_BLUETOOTH_SCO_HEADSET)).isTrue();
}
/**
@@ -407,4 +405,4 @@ public class AudioOutputSwitchPreferenceControllerTest {
return TEST_KEY;
}
}
}
}