From e2ba47face7e6d5bdf35fb135d4e45961850546e Mon Sep 17 00:00:00 2001
From: Hayden Gomes <haydengomes@google.com>
Date: Fri, 12 Jun 2020 13:43:08 -0700
Subject: [PATCH] Updating AudioFormat to handle CHANNEL_IN_DEFAULT

Adding support for CHANNEL_IN_DEFAULT mapping to and from native for
channel mask.

Bug: 155646578
Test: atest
com.google.android.car.ats.CarAudioManagerSystemTest#createAudioPatch_returnsPatchHandle

Change-Id: If76c0142263aa4b8649414cd49b0810156144d09
---
 core/jni/android_media_AudioFormat.h | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/core/jni/android_media_AudioFormat.h b/core/jni/android_media_AudioFormat.h
index a3c455bfc111d..b1b39f3e36ffe 100644
--- a/core/jni/android_media_AudioFormat.h
+++ b/core/jni/android_media_AudioFormat.h
@@ -47,6 +47,7 @@
 
 #define CHANNEL_INVALID 0
 #define CHANNEL_OUT_DEFAULT 1
+#define CHANNEL_IN_DEFAULT 1
 
 static inline audio_format_t audioFormatToNative(int audioFormat)
 {
@@ -196,12 +197,22 @@ static inline int outChannelMaskFromNative(audio_channel_mask_t nativeMask)
 
 static inline audio_channel_mask_t inChannelMaskToNative(int channelMask)
 {
-    return (audio_channel_mask_t)channelMask;
+    switch (channelMask) {
+        case CHANNEL_IN_DEFAULT:
+            return AUDIO_CHANNEL_NONE;
+        default:
+            return (audio_channel_mask_t)channelMask;
+    }
 }
 
 static inline int inChannelMaskFromNative(audio_channel_mask_t nativeMask)
 {
-    return (int)nativeMask;
+    switch (nativeMask) {
+        case AUDIO_CHANNEL_NONE:
+            return CHANNEL_IN_DEFAULT;
+        default:
+            return (int)nativeMask;
+    }
 }
 
 #endif // ANDROID_MEDIA_AUDIOFORMAT_H