commit 049331f6f7056c9ed291cf0d1fdaeddf2031c52b
author Mikhail Naganov <mnaganov@google.com> Thu Mar 16 23:57:13 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 16 23:57:14 2017 +0000
tree f43223b174edf514e8c54710c71abfb2f8413fd0
parent c6216835c8552240a38877705b40c8e65284eb7d
parent 9f61b29a62dfff9f5c7049487e1741a442cedcb8

Merge "audiohal: Rename output flag VOIP_CALL_RX -> VOIP_RX"

audio/common/2.0/types.hal

diff --git a/audio/common/2.0/types.hal b/audio/common/2.0/types.hal
index 93b898b..8760a58 100644
--- a/audio/common/2.0/types.hal
+++ b/audio/common/2.0/types.hal
@@ -672,7 +672,7 @@
     DIRECT_PCM = 0x2000,     // Audio stream containing PCM data that needs
                              // to pass through compress path for DSP post proc.
     MMAP_NOIRQ = 0x4000, // output operates in MMAP no IRQ mode.
-    VOIP_CALL_RX = 0x8000, // preferred output for VoIP calls.
+    VOIP_RX = 0x8000,    // preferred output for VoIP calls.
 };
 
 /*
@@ -689,7 +689,7 @@
     RAW          = 0x4,  // minimize signal processing
     SYNC         = 0x8,  // synchronize I/O streams
     MMAP_NOIRQ   = 0x10, // input operates in MMAP no IRQ mode.
-    VOIP_CALL_TX = 0x20, // preferred input for VoIP calls.
+    VOIP_TX      = 0x20, // preferred input for VoIP calls.
 };
 
 @export(name="audio_usage_t", value_prefix="AUDIO_USAGE_")