From 71aed7699b6fd3ccb77d5b6fe9fdfbff4bdde772 Mon Sep 17 00:00:00 2001
From: jiabin <jiabin@google.com>
Date: Fri, 25 May 2018 12:38:42 -0700
Subject: [PATCH] Remove valid mask of microphone characteristics.

Bug: 79272216
Test: run cts
Change-Id: I58d948eab5eb830f81bdacbb63bb48defcecbf79
---
 audio_platform_info_tavil.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml
index 0194019..862613f 100644
--- a/audio_platform_info_tavil.xml
+++ b/audio_platform_info_tavil.xml
@@ -121,18 +121,24 @@
       <app uc_type="PCM_CAPTURE"  mode="default" bit_width="24" id="69940" max_rate="96000" />
       <app uc_type="PCM_CAPTURE"  mode="voip" bit_width="16" id="69945" max_rate="48000" />
     </app_types>
+    <!-- Mandatory microphone characteristics include: device_id, type,     -->
+    <!-- address, location, group, index_in_the_group, directionality,      -->
+    <!-- num_frequency_responses, frequencies and responses.                -->
+    <!-- Optional microphone characteristics include: Sensitivity, max_spl, -->
+    <!-- min_spl, orientation and geometric_location. If missing they will  -->
+    <!-- be populated as unknown.                                           -->
     <microphone_characteristics>
-        <microphone valid_mask="31" device_id="builtin_mic_1" type="AUDIO_DEVICE_IN_BUILTIN_MIC" address="bottom" location="AUDIO_MICROPHONE_LOCATION_MAINBODY"
+        <microphone device_id="builtin_mic_1" type="AUDIO_DEVICE_IN_BUILTIN_MIC" address="bottom" location="AUDIO_MICROPHONE_LOCATION_MAINBODY"
             group="0" index_in_the_group="0" directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI" num_frequency_responses="256"
             frequencies="99.61 102.54 105.47 108.40 111.33 114.26 117.19 120.12 123.05 125.98 128.91 131.84 134.77 137.70 140.63 143.55 146.48 149.41 152.34 155.27 158.20 161.13 164.06 166.99 169.92 172.85 175.78 178.71 181.64 184.57 187.50 190.43 193.36 199.22 202.15 205.08 210.94 213.87 219.73 222.66 228.52 234.38 237.30 243.16 249.02 254.88 257.81 263.67 269.53 275.39 281.25 287.11 292.97 298.83 307.62 313.48 319.34 325.20 333.98 339.84 345.70 354.49 360.35 369.14 377.93 383.79 392.58 401.37 410.16 418.95 427.73 436.52 445.31 454.10 462.89 474.61 483.40 495.12 503.91 515.63 524.41 536.13 547.85 559.57 571.29 583.01 594.73 609.38 621.09 632.81 647.46 662.11 673.83 688.48 703.13 717.77 732.42 750.00 764.65 779.30 796.88 814.45 832.03 846.68 867.19 884.77 902.34 922.85 940.43 960.94 981.45 1001.95 1022.46 1042.97 1066.41 1089.84 1110.35 1133.79 1157.23 1183.59 1207.03 1233.40 1259.77 1286.13 1312.50 1338.87 1368.16 1397.46 1426.76 1456.05 1485.35 1517.58 1549.80 1582.03 1617.19 1649.41 1684.57 1719.73 1754.88 1792.97 1831.05 1869.14 1907.23 1948.24 1989.26 2030.27 2074.22 2118.16 2162.11 2206.05 2252.93 2299.80 2349.61 2399.41 2449.22 2499.02 2551.76 2607.42 2660.16 2715.82 2774.41 2833.01 2891.60 2953.13 3014.65 3079.10 3143.55 3208.01 3275.39 3345.70 3416.02 3486.33 3559.57 3635.74 3711.91 3791.02 3870.12 3952.15 4034.18 4119.14 4204.10 4291.99 4382.81 4476.56 4570.31 4666.99 4763.67 4863.28 4965.82 5071.29 5176.76 5285.16 5396.48 5510.74 5625.00 5745.12 5865.23 5988.28 6114.26 6243.16 6372.07 6506.84 6644.53 6785.16 6925.78 7072.27 7221.68 7371.09 7526.37 7684.57 7845.70 8012.70 8179.69 8352.54 8528.32 8707.03 8888.67 9076.17 9266.60 9462.89 9659.18 9864.26 10069.34 10283.20 10497.07 10719.73 10945.31 11173.83 11408.20 11648.44 11891.60 12143.55 12398.44 12659.18 12925.78 13195.31 13473.63 13757.81 14044.92 14340.82 14642.58 14950.20 15263.67 15583.01 15911.13 16245.12 16587.89 16936.52 17291.02 17654.30 18026.37 18404.30 18791.02 19186.52 19590.82 20000.98"
             responses="-0.23 -0.26 -0.09 -0.28 -0.46 -0.32 -0.06 0.10 -0.28 -0.41 -0.07 0.21 0.34 0.30 0.25 0.15 0.06 0.07 0.22 0.31 0.45 0.63 0.97 1.21 0.86 0.65 0.74 0.80 0.85 1.06 1.38 1.14 0.77 1.31 1.54 1.63 1.74 1.71 1.52 1.43 1.53 1.99 2.00 1.63 1.75 1.44 1.11 1.21 0.77 0.83 0.89 0.72 0.40 0.70 0.45 0.28 0.62 0.14 0.58 0.37 -0.11 -0.44 0.09 -0.65 -0.58 -0.28 -0.26 0.37 0.58 1.32 1.21 2.02 2.06 2.61 2.57 3.16 3.02 2.87 2.88 2.68 2.65 2.34 2.39 2.54 2.48 1.65 1.14 0.70 0.89 0.19 -0.62 -0.82 -1.17 -1.16 -1.26 -0.66 0.27 0.48 1.28 1.53 1.93 2.14 2.37 1.95 1.60 1.87 1.50 1.71 0.98 0.83 0.08 0.20 0.30 0.64 0.50 0.53 1.18 1.59 1.73 1.64 2.32 1.66 0.61 0.19 0.56 1.85 0.85 1.58 1.92 2.43 1.99 3.69 2.60 1.52 0.76 -0.41 0.24 1.43 0.74 2.95 3.42 4.31 5.74 3.68 3.30 2.89 4.54 4.18 2.47 0.86 -0.55 -1.71 0.90 1.25 2.66 3.38 0.95 5.23 1.42 1.90 3.38 4.70 5.37 3.67 3.75 1.72 5.67 1.36 3.03 7.54 6.71 3.45 0.58 1.22 6.80 5.61 5.71 1.37 -2.06 4.23 5.43 3.43 0.46 2.00 4.63 3.30 3.09 2.44 3.93 4.73 5.21 5.52 5.90 4.01 5.06 5.48 8.03 9.33 5.17 4.77 6.23 6.26 6.78 6.95 6.29 8.82 5.60 4.80 2.16 6.09 2.90 6.41 7.52 7.85 6.48 5.12 6.13 7.79 5.50 9.06 7.82 9.98 9.14 10.36 9.29 9.01 6.95 10.98 11.82 12.02 11.49 13.30 11.53 12.65 13.53 12.21 12.64 14.07 14.12 14.71 15.08 16.27 17.73 17.54 18.24 16.64 17.24 17.17 16.96 16.25 18.65 17.64 14.89 15.97 32.20 19.96"
             sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 0.0 1.0" geometric_location="0.0225 0.0081 0.0078" />
-        <microphone valid_mask="31" device_id="builtin_mic_2" type="AUDIO_DEVICE_IN_BACK_MIC" address="back" location="AUDIO_MICROPHONE_LOCATION_MAINBODY"
+        <microphone device_id="builtin_mic_2" type="AUDIO_DEVICE_IN_BACK_MIC" address="back" location="AUDIO_MICROPHONE_LOCATION_MAINBODY"
             group="0" index_in_the_group="1" directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI" num_frequency_responses="256"
             frequencies="99.61 102.54 105.47 108.40 111.33 114.26 117.19 120.12 123.05 125.98 128.91 131.84 134.77 137.70 140.63 143.55 146.48 149.41 152.34 155.27 158.20 161.13 164.06 166.99 169.92 172.85 175.78 178.71 181.64 184.57 187.50 190.43 193.36 199.22 202.15 205.08 210.94 213.87 219.73 222.66 228.52 234.38 237.30 243.16 249.02 254.88 257.81 263.67 269.53 275.39 281.25 287.11 292.97 298.83 307.62 313.48 319.34 325.20 333.98 339.84 345.70 354.49 360.35 369.14 377.93 383.79 392.58 401.37 410.16 418.95 427.73 436.52 445.31 454.10 462.89 474.61 483.40 495.12 503.91 515.63 524.41 536.13 547.85 559.57 571.29 583.01 594.73 609.38 621.09 632.81 647.46 662.11 673.83 688.48 703.13 717.77 732.42 750.00 764.65 779.30 796.88 814.45 832.03 846.68 867.19 884.77 902.34 922.85 940.43 960.94 981.45 1001.95 1022.46 1042.97 1066.41 1089.84 1110.35 1133.79 1157.23 1183.59 1207.03 1233.40 1259.77 1286.13 1312.50 1338.87 1368.16 1397.46 1426.76 1456.05 1485.35 1517.58 1549.80 1582.03 1617.19 1649.41 1684.57 1719.73 1754.88 1792.97 1831.05 1869.14 1907.23 1948.24 1989.26 2030.27 2074.22 2118.16 2162.11 2206.05 2252.93 2299.80 2349.61 2399.41 2449.22 2499.02 2551.76 2607.42 2660.16 2715.82 2774.41 2833.01 2891.60 2953.13 3014.65 3079.10 3143.55 3208.01 3275.39 3345.70 3416.02 3486.33 3559.57 3635.74 3711.91 3791.02 3870.12 3952.15 4034.18 4119.14 4204.10 4291.99 4382.81 4476.56 4570.31 4666.99 4763.67 4863.28 4965.82 5071.29 5176.76 5285.16 5396.48 5510.74 5625.00 5745.12 5865.23 5988.28 6114.26 6243.16 6372.07 6506.84 6644.53 6785.16 6925.78 7072.27 7221.68 7371.09 7526.37 7684.57 7845.70 8012.70 8179.69 8352.54 8528.32 8707.03 8888.67 9076.17 9266.60 9462.89 9659.18 9864.26 10069.34 10283.20 10497.07 10719.73 10945.31 11173.83 11408.20 11648.44 11891.60 12143.55 12398.44 12659.18 12925.78 13195.31 13473.63 13757.81 14044.92 14340.82 14642.58 14950.20 15263.67 15583.01 15911.13 16245.12 16587.89 16936.52 17291.02 17654.30 18026.37 18404.30 18791.02 19186.52 19590.82 20000.98"
             responses="0.26 0.06 -0.08 -0.16 -0.05 0.01 0.17 0.42 0.14 -0.12 -0.10 0.03 0.10 0.10 0.15 0.19 0.22 0.30 0.32 0.38 0.58 0.65 0.66 0.67 0.70 0.72 0.71 0.67 0.64 0.64 0.62 0.58 0.69 1.18 1.43 1.56 1.62 1.62 1.47 1.38 1.29 1.20 1.16 1.08 1.02 0.97 0.90 1.00 0.92 0.93 1.00 0.89 0.83 0.75 0.66 0.52 0.42 0.34 0.14 0.08 -0.02 -0.13 -0.31 -0.26 -0.29 -0.25 -0.20 -0.09 0.14 0.40 0.68 0.91 1.33 1.54 1.66 1.70 1.58 1.47 1.43 1.23 1.14 0.95 0.76 0.56 0.49 0.46 0.55 0.79 0.83 0.72 0.39 -0.08 -0.53 -1.12 -1.54 -1.45 -1.04 -0.31 0.45 0.97 1.28 1.32 1.06 0.89 0.85 1.03 0.97 1.17 1.22 0.87 0.42 0.00 -0.21 -0.30 -0.53 -0.44 -0.29 -0.08 -0.19 -0.13 0.47 1.50 1.52 1.02 0.65 1.49 1.34 1.33 1.61 1.67 1.25 1.44 0.98 1.00 -0.19 -0.70 0.55 2.94 3.57 3.66 4.40 4.83 5.15 4.47 4.13 3.09 3.07 2.74 2.90 2.69 2.24 -0.23 -1.56 -2.65 2.11 4.98 4.40 5.14 4.56 3.83 3.83 5.48 5.16 3.72 5.59 5.17 6.04 5.29 4.75 6.05 5.01 4.38 5.05 4.15 4.29 6.15 5.19 3.46 2.81 3.79 7.34 7.00 4.97 6.03 7.99 7.16 6.91 6.88 8.80 9.80 8.47 9.28 11.02 10.61 8.48 10.60 11.31 8.03 12.39 13.00 11.19 13.69 15.42 14.80 15.64 17.39 15.16 18.50 19.69 20.50 22.19 24.75 27.10 26.67 23.02 23.53 21.02 19.62 15.29 15.92 14.64 14.70 13.45 14.84 16.10 12.79 10.10 11.98 10.10 10.43 11.41 9.03 6.82 8.51 8.93 8.36 9.46 10.04 10.97 10.47 7.52 7.22 6.89 7.20 7.59 7.79 6.69 7.30 7.55 8.43 9.19 10.27 8.05 7.88 18.67 11.77"
             sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 1.0 0.0" geometric_location="0.0212 0.1457 0.0041" />
-        <microphone valid_mask="31" device_id="builtin_mic_3" type="AUDIO_DEVICE_IN_BUILTIN_MIC" address="top" location="AUDIO_MICROPHONE_LOCATION_MAINBODY"
+        <microphone device_id="builtin_mic_3" type="AUDIO_DEVICE_IN_BUILTIN_MIC" address="top" location="AUDIO_MICROPHONE_LOCATION_MAINBODY"
             group="0" index_in_the_group="2" directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI" num_frequency_responses="256"
             frequencies="99.61 102.54 105.47 108.40 111.33 114.26 117.19 120.12 123.05 125.98 128.91 131.84 134.77 137.70 140.63 143.55 146.48 149.41 152.34 155.27 158.20 161.13 164.06 166.99 169.92 172.85 175.78 178.71 181.64 184.57 187.50 190.43 193.36 199.22 202.15 205.08 210.94 213.87 219.73 222.66 228.52 234.38 237.30 243.16 249.02 254.88 257.81 263.67 269.53 275.39 281.25 287.11 292.97 298.83 307.62 313.48 319.34 325.20 333.98 339.84 345.70 354.49 360.35 369.14 377.93 383.79 392.58 401.37 410.16 418.95 427.73 436.52 445.31 454.10 462.89 474.61 483.40 495.12 503.91 515.63 524.41 536.13 547.85 559.57 571.29 583.01 594.73 609.38 621.09 632.81 647.46 662.11 673.83 688.48 703.13 717.77 732.42 750.00 764.65 779.30 796.88 814.45 832.03 846.68 867.19 884.77 902.34 922.85 940.43 960.94 981.45 1001.95 1022.46 1042.97 1066.41 1089.84 1110.35 1133.79 1157.23 1183.59 1207.03 1233.40 1259.77 1286.13 1312.50 1338.87 1368.16 1397.46 1426.76 1456.05 1485.35 1517.58 1549.80 1582.03 1617.19 1649.41 1684.57 1719.73 1754.88 1792.97 1831.05 1869.14 1907.23 1948.24 1989.26 2030.27 2074.22 2118.16 2162.11 2206.05 2252.93 2299.80 2349.61 2399.41 2449.22 2499.02 2551.76 2607.42 2660.16 2715.82 2774.41 2833.01 2891.60 2953.13 3014.65 3079.10 3143.55 3208.01 3275.39 3345.70 3416.02 3486.33 3559.57 3635.74 3711.91 3791.02 3870.12 3952.15 4034.18 4119.14 4204.10 4291.99 4382.81 4476.56 4570.31 4666.99 4763.67 4863.28 4965.82 5071.29 5176.76 5285.16 5396.48 5510.74 5625.00 5745.12 5865.23 5988.28 6114.26 6243.16 6372.07 6506.84 6644.53 6785.16 6925.78 7072.27 7221.68 7371.09 7526.37 7684.57 7845.70 8012.70 8179.69 8352.54 8528.32 8707.03 8888.67 9076.17 9266.60 9462.89 9659.18 9864.26 10069.34 10283.20 10497.07 10719.73 10945.31 11173.83 11408.20 11648.44 11891.60 12143.55 12398.44 12659.18 12925.78 13195.31 13473.63 13757.81 14044.92 14340.82 14642.58 14950.20 15263.67 15583.01 15911.13 16245.12 16587.89 16936.52 17291.02 17654.30 18026.37 18404.30 18791.02 19186.52 19590.82 20000.98"
             responses="-1.45 -1.74 -1.62 -1.75 -1.67 -1.48 -1.69 -1.91 -1.82 -1.75 -1.49 -1.36 -1.35 -1.27 -1.19 -1.19 -1.09 -1.11 -1.27 -1.27 -1.11 -0.83 -0.56 -0.57 -0.58 -0.47 -0.51 -0.57 -0.63 -0.64 -0.55 -0.68 -0.76 0.01 0.32 0.41 0.29 0.43 0.12 -0.14 0.23 0.16 0.18 0.09 -0.02 -0.14 -0.12 -0.40 -0.43 -0.15 -0.21 -0.42 -0.54 -0.33 -0.46 -0.80 -0.66 -0.71 -0.77 -0.96 -1.28 -1.32 -1.27 -1.37 -1.49 -1.47 -1.43 -1.28 -1.11 -0.79 -0.72 -0.45 0.30 0.47 0.90 0.95 0.95 0.94 0.75 0.65 0.83 0.24 0.11 0.00 0.08 -0.13 -0.44 0.18 0.43 0.43 0.18 0.00 -0.31 -0.80 -1.14 -0.72 -0.76 -0.50 -0.08 0.25 0.88 0.75 0.79 0.66 0.63 0.68 0.52 0.87 1.03 0.67 0.14 0.10 0.17 0.37 0.45 0.33 0.13 0.26 0.42 0.74 1.24 2.22 1.95 1.79 1.46 2.64 2.69 1.25 2.12 2.39 3.18 3.51 3.19 3.16 2.61 2.39 3.43 4.79 5.43 6.08 7.01 7.05 5.81 5.07 4.19 3.89 3.46 3.45 3.20 3.52 4.61 4.17 4.05 4.68 4.64 5.46 6.00 7.41 6.59 5.77 6.67 7.74 5.93 6.17 8.07 7.02 9.90 7.96 6.70 8.76 9.04 7.09 8.24 8.27 9.35 6.82 5.38 6.28 6.10 8.48 6.25 6.74 5.10 7.17 7.83 3.66 5.75 7.68 6.52 7.64 9.37 8.45 10.19 10.18 9.60 9.90 10.89 10.56 12.34 10.02 12.48 9.36 12.95 10.50 10.50 11.81 10.16 8.86 8.92 9.29 9.84 12.21 12.31 13.39 11.54 12.38 12.10 13.03 10.77 13.94 14.73 15.59 15.73 17.14 17.77 15.20 14.12 15.84 13.98 17.79 19.86 18.31 17.22 17.24 16.79 15.97 16.11 15.90 17.19 17.55 15.84 13.70 16.01 15.66 14.27 15.13 15.95 14.48 14.71 14.88 15.13 13.25 13.74 10.18 9.94 11.96"