aboutsummaryrefslogtreecommitdiff
path: root/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink
diff options
context:
space:
mode:
authorHongwei Wang <hwwang@google.com>2018-01-12 16:55:46 -0800
committerHongwei Wang <hwwang@google.com>2018-01-24 16:48:41 -0800
commita5a2b393e10feaa728ccad7fe3bb57a334152f7e (patch)
tree415e0a2d5367c5246045c0d95f7f3f9cc2401a89 /tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink
parentd133205e6c58a20ad9e37838a3adf007a607cf02 (diff)
downloadCar-a5a2b393e10feaa728ccad7fe3bb57a334152f7e.tar.gz
Deprecates CAR_AUDIO_USAGE - part 1
Uses AudioAttributes.USAGE_ instead. Deprecates also the CarAudioAttributesUtil utility class. `make update-car-api` is used to update current.txt and proguard-release.flags What's next - Establish the static mapping from AA.USAGE to car audio context - Integrate with audio control HAL to map car audio context to physical bus address - Deprecate the audio_hw_variant BUG: 72046976 Test: lunch gcar_emu-x86 && m -j // Verify in Car Settings Change-Id: If152c4c3c3dc01f3595a1cf9ce8135996cd8cba6
Diffstat (limited to 'tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink')
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/audio/AudioTestFragment.java29
1 files changed, 15 insertions, 14 deletions
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/audio/AudioTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/audio/AudioTestFragment.java
index 7d6fcd24cd..626dc2a385 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/audio/AudioTestFragment.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/audio/AudioTestFragment.java
@@ -124,20 +124,21 @@ public class AudioTestFragment extends Fragment {
} catch (CarNotConnectedException e) {
throw new RuntimeException("Failed to create audio manager", e);
}
- try {
- mMusicAudioAttrib = mCarAudioManager.getAudioAttributesForCarUsage(
- CarAudioManager.CAR_AUDIO_USAGE_MUSIC);
- mNavAudioAttrib = mCarAudioManager.getAudioAttributesForCarUsage(
- CarAudioManager.CAR_AUDIO_USAGE_NAVIGATION_GUIDANCE);
- mVrAudioAttrib = mCarAudioManager.getAudioAttributesForCarUsage(
- CarAudioManager.CAR_AUDIO_USAGE_VOICE_COMMAND);
- mRadioAudioAttrib = mCarAudioManager.getAudioAttributesForCarUsage(
- CarAudioManager.CAR_AUDIO_USAGE_RADIO);
- mSystemSoundAudioAttrib = mCarAudioManager.getAudioAttributesForCarUsage(
- CarAudioManager.CAR_AUDIO_USAGE_SYSTEM_SOUND);
- } catch (CarNotConnectedException e) {
- //ignore for now
- }
+ mMusicAudioAttrib = new AudioAttributes.Builder()
+ .setUsage(AudioAttributes.USAGE_MEDIA)
+ .build();
+ mNavAudioAttrib = new AudioAttributes.Builder()
+ .setUsage(AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE)
+ .build();
+ mVrAudioAttrib = new AudioAttributes.Builder()
+ .setUsage(AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE)
+ .build();
+ mRadioAudioAttrib = new AudioAttributes.Builder()
+ .setUsage(AudioAttributes.USAGE_MEDIA)
+ .build();
+ mSystemSoundAudioAttrib = new AudioAttributes.Builder()
+ .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)
+ .build();
mMusicPlayer = new AudioPlayer(mContext, R.raw.well_worth_the_wait,
mMusicAudioAttrib);