diff options
| author | Keun-young Park <keunyoung@google.com> | 2016-03-28 18:12:09 -0700 |
|---|---|---|
| committer | Keun-young Park <keunyoung@google.com> | 2016-03-29 19:23:19 +0000 |
| commit | 6a7361506afcf709101aa6314056361649a000d0 (patch) | |
| tree | dd32a22a3e64dff8b87f344334cf881e5f404a12 /libvehiclenetwork | |
| parent | ad0a7c4cd56f21088d17f4302a64ba678dee0447 (diff) | |
| download | Car-6a7361506afcf709101aa6314056361649a000d0.tar.gz | |
cleanup audio config
- add "radio" to audio routing and remove
all specialization for radio.
- make focus wait timeout overridable.
- fix wrong handling of VR context: CAR_AUDIO_USAGE should
be used instead of CAR_AUDIO_TYPE to check internal usages
- send radio context to vehicle hal for radio: Do not
delete radio context anymore. Also cleaned up some radio
handling
bug: 27886033
Change-Id: Iae5148291a5d63c79bf49d3bbc5ee73055a20411
(cherry picked from commit 3057ebd67bdbeaee67f132c6f0004d04d8943dfd)
Diffstat (limited to 'libvehiclenetwork')
| -rw-r--r-- | libvehiclenetwork/java/src/com/android/car/vehiclenetwork/VehicleNetworkConsts.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libvehiclenetwork/java/src/com/android/car/vehiclenetwork/VehicleNetworkConsts.java b/libvehiclenetwork/java/src/com/android/car/vehiclenetwork/VehicleNetworkConsts.java index 5e627a9057..de792ed0a9 100644 --- a/libvehiclenetwork/java/src/com/android/car/vehiclenetwork/VehicleNetworkConsts.java +++ b/libvehiclenetwork/java/src/com/android/car/vehiclenetwork/VehicleNetworkConsts.java @@ -468,10 +468,10 @@ default: return "UNKNOWN"; } public static class VehicleAudioHwVariantConfigFlag { -public static final int VEHICLE_AUDIO_HW_VARIANT_FLAG_PASS_RADIO_AUDIO_FOCUS_FLAG = 0x1; +public static final int VEHICLE_AUDIO_HW_VARIANT_FLAG_INTERNAL_RADIO_FLAG = 0x1; public static String enumToString(int v) { switch(v) { -case VEHICLE_AUDIO_HW_VARIANT_FLAG_PASS_RADIO_AUDIO_FOCUS_FLAG: return "VEHICLE_AUDIO_HW_VARIANT_FLAG_PASS_RADIO_AUDIO_FOCUS_FLAG"; +case VEHICLE_AUDIO_HW_VARIANT_FLAG_INTERNAL_RADIO_FLAG: return "VEHICLE_AUDIO_HW_VARIANT_FLAG_INTERNAL_RADIO_FLAG"; default: return "UNKNOWN"; } } |