commit a43dd880cfcfd1cd6992a4cf0df13cb104a1a24c
author jiabin <jiabin@google.com> Mon May 07 10:52:37 2018 -0700
committer jiabin <jiabin@google.com> Tue May 08 12:02:18 2018 -0700
tree c225e4a7ccc7c115f24d6abb74ba92b6ede7456e
parent 196df23d1c89de75fca5ec27d0138b109bf48844

Remove valid_mask from audio.h

As valid mask only using in hal to indicate which fields of microphone
characteristics is available and it is not used in other case, we can
only keep it in hal layer instead of audio.h.

Bug: 79272216
Test: run cts
Change-Id: I3abe3e4f2496d4c3093849002324bffbb738ec0f

hal/platform_info.c

diff --git a/hal/platform_info.c b/hal/platform_info.c
index 41483f4..58631f2 100644
--- a/hal/platform_info.c
+++ b/hal/platform_info.c
@@ -125,6 +125,17 @@
     AUDIO_MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_DEFAULT),
 };
 
+enum {
+    AUDIO_MICROPHONE_CHARACTERISTIC_NONE = 0u, // 0x0
+    AUDIO_MICROPHONE_CHARACTERISTIC_SENSITIVITY = 1u, // 0x1
+    AUDIO_MICROPHONE_CHARACTERISTIC_MAX_SPL = 2u, // 0x2
+    AUDIO_MICROPHONE_CHARACTERISTIC_MIN_SPL = 4u, // 0x4
+    AUDIO_MICROPHONE_CHARACTERISTIC_ORIENTATION = 8u, // 0x8
+    AUDIO_MICROPHONE_CHARACTERISTIC_GEOMETRIC_LOCATION = 16u, // 0x10
+    AUDIO_MICROPHONE_CHARACTERISTIC_ALL = 31u, /* ((((SENSITIVITY | MAX_SPL) | MIN_SPL)
+                                                  | ORIENTATION) | GEOMETRIC_LOCATION) */
+};
+
 static bool find_enum_by_string(const struct audio_string_to_enum * table, const char * name,
                                 int32_t len, unsigned int *value)
 {
@@ -433,7 +444,7 @@
         ALOGE("%s: valid_mask not found", __func__);
         goto done;
     }
-    microphone.valid_mask = atoi(attr[curIdx++]);
+    uint32_t valid_mask = atoi(attr[curIdx++]);
 
     if (strcmp(attr[curIdx++], "device_id")) {
         ALOGE("%s: device_id not found", __func__);
@@ -556,7 +567,7 @@
         }
     }
 
-    if (microphone.valid_mask & AUDIO_MICROPHONE_CHARACTERISTIC_SENSITIVITY) {
+    if (valid_mask & AUDIO_MICROPHONE_CHARACTERISTIC_SENSITIVITY) {
         if (strcmp(attr[curIdx++], "sensitivity")) {
             ALOGE("%s: sensitivity not found", __func__);
             goto done;
@@ -566,7 +577,7 @@
         microphone.sensitivity = AUDIO_MICROPHONE_SENSITIVITY_UNKNOWN;
     }
 
-    if (microphone.valid_mask & AUDIO_MICROPHONE_CHARACTERISTIC_MAX_SPL) {
+    if (valid_mask & AUDIO_MICROPHONE_CHARACTERISTIC_MAX_SPL) {
         if (strcmp(attr[curIdx++], "max_spl")) {
             ALOGE("%s: max_spl not found", __func__);
             goto done;
@@ -576,7 +587,7 @@
         microphone.max_spl = AUDIO_MICROPHONE_SPL_UNKNOWN;
     }
 
-    if (microphone.valid_mask & AUDIO_MICROPHONE_CHARACTERISTIC_MIN_SPL) {
+    if (valid_mask & AUDIO_MICROPHONE_CHARACTERISTIC_MIN_SPL) {
         if (strcmp(attr[curIdx++], "min_spl")) {
             ALOGE("%s: min_spl not found", __func__);
             goto done;
@@ -586,7 +597,7 @@
         microphone.min_spl = AUDIO_MICROPHONE_SPL_UNKNOWN;
     }
 
-    if (microphone.valid_mask & AUDIO_MICROPHONE_CHARACTERISTIC_ORIENTATION) {
+    if (valid_mask & AUDIO_MICROPHONE_CHARACTERISTIC_ORIENTATION) {
         if (strcmp(attr[curIdx++], "orientation")) {
             ALOGE("%s: orientation not found", __func__);
             goto done;
@@ -615,7 +626,7 @@
         microphone.orientation.z = 0.0f;
     }
 
-    if (microphone.valid_mask & AUDIO_MICROPHONE_CHARACTERISTIC_GEOMETRIC_LOCATION) {
+    if (valid_mask & AUDIO_MICROPHONE_CHARACTERISTIC_GEOMETRIC_LOCATION) {
         if (strcmp(attr[curIdx++], "geometric_location")) {
             ALOGE("%s: geometric_location not found", __func__);
             goto done;