Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903

Bug: 166295507
Merged-In: If5e48560c5bfbbb1f1abb8f67843efda302a3b64
Change-Id: I08ba9038c15f54bf2313b1a741b49b239480c21a

7 files changed, 605 insertions, 73 deletions

diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml
index 219f7dc..f6d8c9f 100644
--- a/audio_platform_info_tavil.xml
+++ b/audio_platform_info_tavil.xml
@@ -77,6 +77,7 @@
         <usecase name="USECASE_AUDIO_PLAYBACK_VOIP" type="out" id="16" />
         <usecase name="USECASE_AUDIO_RECORD_VOIP" type="in" id="16" />
         <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="27" />
+        <usecase name="USECASE_INCALL_MUSIC_UPLINK2" type="out" id="27" />
     </pcm_ids>
     <config_params>
         <param key="input_mic_max_count" value="3"/>
@@ -139,7 +140,7 @@
             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 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="bottom" 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"
@@ -149,36 +150,88 @@
     <snd_devices>
         <input_snd_device>
             <input_snd_device_mic_mapping>
-                <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_MIC">
-                    <mic_info mic_device_id="builtin_mic_1"
-                        channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-                </snd_dev>
-                <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS">
-                    <mic_info mic_device_id="builtin_mic_1"
-                        channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
-                    <mic_info mic_device_id="builtin_mic_2"
-                        channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-                </snd_dev>
-                <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_DMIC_TMUS">
-                    <mic_info mic_device_id="builtin_mic_1"
-                        channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
-                    <mic_info mic_device_id="builtin_mic_3"
-                        channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/>
-                </snd_dev>
-                <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_REC_MIC">
-                    <mic_info mic_device_id="builtin_mic_1"
-                        channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/>
-                    <mic_info mic_device_id="builtin_mic_3"
-                        channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
-                </snd_dev>
-                <snd_dev in_snd_device="SND_DEVICE_IN_THREE_MIC">
-                    <mic_info mic_device_id="builtin_mic_1"
-                        channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
-                    <mic_info mic_device_id="builtin_mic_2"
-                        channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
-                    <mic_info mic_device_id="builtin_mic_3"
-                        channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/>
-                </snd_dev>
+                    <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_MIC">
+                        <mic_info mic_device_id="builtin_mic_1"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                    </snd_dev>
+                    <snd_dev in_snd_device="SND_DEVICE_IN_CAMCORDER_LANDSCAPE">
+                        <mic_info mic_device_id="builtin_mic_2"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                    </snd_dev>
+                    <snd_dev in_snd_device="SND_DEVICE_IN_CAMCORDER_INVERT_LANDSCAPE">
+                        <mic_info mic_device_id="builtin_mic_2"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                    </snd_dev>
+                    <snd_dev in_snd_device="SND_DEVICE_IN_CAMCORDER_PORTRAIT">
+                        <mic_info mic_device_id="builtin_mic_2"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                    </snd_dev>
+                    <snd_dev in_snd_device="SND_DEVICE_IN_CAMCORDER_SELFIE_LANDSCAPE">
+                        <mic_info mic_device_id="builtin_mic_2"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                    </snd_dev>
+                    <snd_dev in_snd_device="SND_DEVICE_IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE">
+                        <mic_info mic_device_id="builtin_mic_2"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                    </snd_dev>
+                    <snd_dev in_snd_device="SND_DEVICE_IN_CAMCORDER_SELFIE_PORTRAIT">
+                        <mic_info mic_device_id="builtin_mic_2"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                    </snd_dev>
+                    <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_REC_MIC">
+                        <mic_info mic_device_id="builtin_mic_1"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/>
+                    </snd_dev>
+                    <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_REC_MIC_NS">
+                        <mic_info mic_device_id="builtin_mic_1"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                    </snd_dev>
+                    <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_REC_MIC_AEC">
+                        <mic_info mic_device_id="builtin_mic_1"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                    </snd_dev>
+                    <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_REC_MIC_AEC_NS">
+                        <mic_info mic_device_id="builtin_mic_1"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                    </snd_dev>
+                    <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_REC_DMIC_STEREO">
+                        <mic_info mic_device_id="builtin_mic_1"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
+                        <mic_info mic_device_id="builtin_mic_2"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/>
+                    </snd_dev>
+                    <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_DMIC_STEREO">
+                        <mic_info mic_device_id="builtin_mic_1"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
+                        <mic_info mic_device_id="builtin_mic_2"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                    </snd_dev>
+                    <snd_dev in_snd_device="SND_DEVICE_IN_THREE_MIC">
+                        <mic_info mic_device_id="builtin_mic_1"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                        <mic_info mic_device_id="builtin_mic_2"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
+                        <mic_info mic_device_id="builtin_mic_3"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
+                    </snd_dev>
+                    <snd_dev in_snd_device="SND_DEVICE_IN_UNPROCESSED_MIC">
+                        <mic_info mic_device_id="builtin_mic_1"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/>
+                    </snd_dev>
+                    <snd_dev in_snd_device="SND_DEVICE_IN_UNPROCESSED_STEREO_MIC">
+                        <mic_info mic_device_id="builtin_mic_1"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
+                        <mic_info mic_device_id="builtin_mic_2"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/>
+                    </snd_dev>
+                    <snd_dev in_snd_device="SND_DEVICE_IN_UNPROCESSED_THREE_MIC">
+                        <mic_info mic_device_id="builtin_mic_1"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/>
+                        <mic_info mic_device_id="builtin_mic_2"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
+                        <mic_info mic_device_id="builtin_mic_3"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
+                    </snd_dev>
             </input_snd_device_mic_mapping>
         </input_snd_device>
     </snd_devices>
diff --git a/device-walleye.mk b/device-walleye.mk
index eebfb0f..36a5483 100644
--- a/device-walleye.mk
+++ b/device-walleye.mk
@@ -36,10 +36,6 @@ include device/google/muskie/device-common.mk
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.sf.lcd_density=420
 
-# Enable Perfetto traced
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-    persist.traced.enable=1
-
 # Thermal HAL
 PRODUCT_COPY_FILES += \
     device/google/muskie/thermal_info_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json
diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml
index 926d74f..01f07d0 100644
--- a/mixer_paths_tavil.xml
+++ b/mixer_paths_tavil.xml
@@ -2218,4 +2218,76 @@
     <path name ="voice-music-tx">
     </path>
 
+    <path name="incall-music-uplink2">
+        <ctl name="Incall_Music_2 Audio Mixer MultiMedia9" value="1" />
+    </path>
+
+    <path name="incall-music-uplink2 speaker">
+        <path name="incall-music-uplink2" />
+    </path>
+
+    <path name="incall-music-uplink2 handset">
+        <path name="incall-music-uplink2" />
+    </path>
+
+    <path name="incall-music-uplink2 handset-hac">
+        <path name="incall-music-uplink2" />
+    </path>
+
+    <path name="incall-music-uplink2 display-port">
+        <path name="incall-music-uplink2" />
+    </path>
+
+    <path name="incall-music-uplink2 bt-sco">
+        <path name="incall-music-uplink2" />
+    </path>
+
+    <path name="incall-music-uplink2 bt-sco-wb">
+        <path name="incall-music-uplink2" />
+    </path>
+
+    <path name="incall-music-uplink2 speaker-and-display-port">
+        <path name="incall-music-uplink2" />
+    </path>
+
+    <path name="incall-music-uplink2 afe-proxy">
+        <path name="incall-music-uplink2" />
+    </path>
+
+    <path name="incall-music-uplink2 usb-headphones">
+        <path name="incall-music-uplink2" />
+    </path>
+
+    <path name="incall-music-uplink2 usb-headset">
+        <path name="incall-music-uplink2" />
+    </path>
+
+    <path name="incall-music-uplink2 speaker-and-usb-headphones">
+        <path name="incall-music-uplink2" />
+    </path>
+
+    <path name="incall-music-uplink2 headphones">
+        <path name="incall-music-uplink2" />
+    </path>
+
+    <path name="incall-music-uplink2 speaker-and-headphones">
+        <path name="incall-music-uplink2" />
+    </path>
+
+    <path name="incall-music-uplink2 speaker-and-bt-sco">
+        <path name="incall-music-uplink2" />
+    </path>
+
+    <path name="incall-music-uplink2 voice-tty-hco-handset">
+        <path name="incall-music-uplink2" />
+    </path>
+
+    <path name="incall-music-uplink2 speaker-and-bt-a2dp">
+        <path name="incall-music-uplink2" />
+    </path>
+
+    <path name="incall-music-uplink2 bt-a2dp">
+        <path name="incall-music-uplink2" />
+    </path>
+
 </mixer>
diff --git a/self-extractors/qcom/staging/Android.bp.txt b/self-extractors/qcom/staging/Android.bp.txt
new file mode 100644
index 0000000..0cc1c9b
--- /dev/null
+++ b/self-extractors/qcom/staging/Android.bp.txt
@@ -0,0 +1,417 @@
+// Copyright (C) 2020 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+soong_namespace {
+}
+
+cc_prebuilt_library_shared {
+    name: "com.qualcomm.qti.imsrtpservice@1.0",
+    arch: {
+        arm: {
+            srcs: ["com.qualcomm.qti.imsrtpservice@1.0.so"],
+            shared_libs: [
+                "libhidlbase",
+                // "libhidltransport",
+                // "libhwbinder",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+        arm64: {
+            srcs: ["lib64/com.qualcomm.qti.imsrtpservice@1.0.so"],
+            shared_libs: [
+                "libhidlbase",
+                // "libhidltransport",
+                // "libhwbinder",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "both",
+    owner: "qcom",
+    strip: {
+        none: true,
+    },
+    check_elf_files: false,
+}
+
+cc_prebuilt_library_shared {
+    name: "libdiag_system",
+    arch: {
+        arm: {
+            srcs: ["libdiag_system.so"],
+            shared_libs: [
+                "liblog",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+        arm64: {
+            srcs: ["lib64/libdiag_system.so"],
+            shared_libs: [
+                "liblog",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "both",
+    owner: "qcom",
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "libimscamera_jni",
+    arch: {
+        arm: {
+            srcs: ["libimscamera_jni.so"],
+            shared_libs: [
+                "libnativehelper",
+                "libcutils",
+                "libutils",
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+        arm64: {
+            srcs: ["lib64/libimscamera_jni.so"],
+            shared_libs: [
+                "libnativehelper",
+                "libcutils",
+                "libutils",
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "both",
+    owner: "qcom",
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "libimsmedia_jni",
+    arch: {
+        arm: {
+            srcs: ["libimsmedia_jni.so"],
+            shared_libs: [
+                "libnativehelper",
+                "libcutils",
+                "libutils",
+                "libgui",
+                "libbinder",
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+        arm64: {
+            srcs: ["lib64/libimsmedia_jni.so"],
+            shared_libs: [
+                "libnativehelper",
+                "libcutils",
+                "libutils",
+                "libgui",
+                "libbinder",
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "both",
+    owner: "qcom",
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "lib-imsvideocodec",
+    arch: {
+        arm: {
+            srcs: ["lib-imsvideocodec.so"],
+            shared_libs: [
+                "libmediandk",
+                "libcutils",
+                "libutils",
+                "liblog",
+                "libnativehelper",
+                "libandroid",
+                "libui",
+                "libmedia",
+                "libbinder",
+                "libGLESv2",
+                "libgui",
+                "libdiag_system",
+                "libEGL",
+                "lib-imsvtutils",
+                "libcamera_client",
+                "lib-imsvtextutils",
+                "libnativewindow",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+        arm64: {
+            srcs: ["lib64/lib-imsvideocodec.so"],
+            shared_libs: [
+                "libmediandk",
+                "libcutils",
+                "libutils",
+                "liblog",
+                "libnativehelper",
+                "libandroid",
+                "libui",
+                "libmedia",
+                "libbinder",
+                "libGLESv2",
+                "libgui",
+                "libdiag_system",
+                "libEGL",
+                "lib-imsvtutils",
+                "libcamera_client",
+                "lib-imsvtextutils",
+                "libnativewindow",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "both",
+    owner: "qcom",
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "lib-imsvtextutils",
+    arch: {
+        arm: {
+            srcs: ["lib-imsvtextutils.so"],
+            shared_libs: [
+                "libutils",
+                "libcutils",
+                "liblog",
+                "libdiag_system",
+                "lib-imsvtutils",
+                "libGLESv2",
+                "libEGL",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+        arm64: {
+            srcs: ["lib64/lib-imsvtextutils.so"],
+            shared_libs: [
+                "libutils",
+                "libcutils",
+                "liblog",
+                "libdiag_system",
+                "lib-imsvtutils",
+                "libGLESv2",
+                "libEGL",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "both",
+    owner: "qcom",
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "lib-imsvt",
+    arch: {
+        arm: {
+            srcs: ["lib-imsvt.so"],
+            shared_libs: [
+                "libdiag_system",
+                "libcutils",
+                "libutils",
+                "liblog",
+                "libnativehelper",
+                "libandroid",
+                "libgui",
+                "libui",
+                "libbinder",
+                "lib-imsvideocodec",
+                "lib-imsvtutils",
+                "libbase",
+                "libhardware_legacy",
+                "libhardware",
+                // "libhwbinder",
+                "libhidlbase",
+                // "libhidltransport",
+                "com.qualcomm.qti.imsrtpservice@1.0",
+                "librcc",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+        arm64: {
+            srcs: ["lib64/lib-imsvt.so"],
+            shared_libs: [
+                "libdiag_system",
+                "libcutils",
+                "libutils",
+                "liblog",
+                "libnativehelper",
+                "libandroid",
+                "libgui",
+                "libui",
+                "libbinder",
+                "lib-imsvideocodec",
+                "lib-imsvtutils",
+                "libbase",
+                "libhardware_legacy",
+                "libhardware",
+                // "libhwbinder",
+                "libhidlbase",
+                // "libhidltransport",
+                "com.qualcomm.qti.imsrtpservice@1.0",
+                "librcc",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "both",
+    owner: "qcom",
+    strip: {
+        none: true,
+    },
+    check_elf_files: false,
+}
+
+cc_prebuilt_library_shared {
+    name: "lib-imsvtutils",
+    arch: {
+        arm: {
+            srcs: ["lib-imsvtutils.so"],
+            shared_libs: [
+                "libutils",
+                "libcutils",
+                "liblog",
+                "libdiag_system",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+        arm64: {
+            srcs: ["lib64/lib-imsvtutils.so"],
+            shared_libs: [
+                "libutils",
+                "libcutils",
+                "liblog",
+                "libdiag_system",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "both",
+    owner: "qcom",
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "librcc",
+    arch: {
+        arm: {
+            srcs: ["librcc.so"],
+            shared_libs: [
+                "libutils",
+                "libcutils",
+                "liblog",
+                "libdiag_system",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+        arm64: {
+            srcs: ["lib64/librcc.so"],
+            shared_libs: [
+                "libutils",
+                "libcutils",
+                "liblog",
+                "libdiag_system",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "both",
+    owner: "qcom",
+    strip: {
+        none: true,
+    },
+}
diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk
index 9212206..d0367e6 100644
--- a/self-extractors/qcom/staging/device-partial.mk
+++ b/self-extractors/qcom/staging/device-partial.mk
@@ -12,11 +12,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/qcom/walleye/proprietary
+
 # AOSP packages required by the blobs
 PRODUCT_PACKAGES := \
     ims
 
 #  blob(s) necessary for Walleye hardware
+PRODUCT_PACKAGES += \
+    com.qualcomm.qti.imsrtpservice@1.0 \
+    libdiag_system \
+    libimscamera_jni \
+    libimsmedia_jni \
+    lib-imsvideocodec \
+    lib-imsvtextutils \
+    lib-imsvt \
+    lib-imsvtutils \
+    librcc \
+
 PRODUCT_COPY_FILES := \
     vendor/qcom/walleye/proprietary/ATT_profiles.xml:system/etc/cne/Nexus/ATT/ATT_profiles.xml:qcom \
     vendor/qcom/walleye/proprietary/ROW_profiles.xml:system/etc/cne/Nexus/ROW/ROW_profiles.xml:qcom \
@@ -30,21 +44,4 @@ PRODUCT_COPY_FILES := \
     vendor/qcom/walleye/proprietary/com.quicinc.cne.jar:system/framework/com.quicinc.cne.jar:qcom \
     vendor/qcom/walleye/proprietary/rcsimssettings.jar:system/framework/rcsimssettings.jar:qcom \
     vendor/qcom/walleye/proprietary/qcrilhook.jar:system/framework/qcrilhook.jar:qcom \
-    vendor/qcom/walleye/proprietary/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:system/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:qcom \
-    vendor/qcom/walleye/proprietary/lib64/libdiag_system.so:system/lib64/libdiag_system.so:qcom \
-    vendor/qcom/walleye/proprietary/lib64/libimscamera_jni.so:system/lib64/libimscamera_jni.so:qcom \
-    vendor/qcom/walleye/proprietary/lib64/libimsmedia_jni.so:system/lib64/libimsmedia_jni.so:qcom \
-    vendor/qcom/walleye/proprietary/lib64/lib-imsvideocodec.so:system/lib64/lib-imsvideocodec.so:qcom \
-    vendor/qcom/walleye/proprietary/lib64/lib-imsvtextutils.so:system/lib64/lib-imsvtextutils.so:qcom \
-    vendor/qcom/walleye/proprietary/lib64/lib-imsvt.so:system/lib64/lib-imsvt.so:qcom \
-    vendor/qcom/walleye/proprietary/lib64/lib-imsvtutils.so:system/lib64/lib-imsvtutils.so:qcom \
-    vendor/qcom/walleye/proprietary/lib64/librcc.so:system/lib64/librcc.so:qcom \
-    vendor/qcom/walleye/proprietary/com.qualcomm.qti.imsrtpservice@1.0.so:system/lib/com.qualcomm.qti.imsrtpservice@1.0.so:qcom \
-    vendor/qcom/walleye/proprietary/libdiag_system.so:system/lib/libdiag_system.so:qcom \
-    vendor/qcom/walleye/proprietary/libimscamera_jni.so:system/lib/libimscamera_jni.so:qcom \
-    vendor/qcom/walleye/proprietary/libimsmedia_jni.so:system/lib/libimsmedia_jni.so:qcom \
-    vendor/qcom/walleye/proprietary/lib-imsvideocodec.so:system/lib/lib-imsvideocodec.so:qcom \
-    vendor/qcom/walleye/proprietary/lib-imsvtextutils.so:system/lib/lib-imsvtextutils.so:qcom \
-    vendor/qcom/walleye/proprietary/lib-imsvt.so:system/lib/lib-imsvt.so:qcom \
-    vendor/qcom/walleye/proprietary/lib-imsvtutils.so:system/lib/lib-imsvtutils.so:qcom \
-    vendor/qcom/walleye/proprietary/librcc.so:system/lib/librcc.so:qcom \
+
diff --git a/thermal_info_config.json b/thermal_info_config.json
index 25f95d0..3bb24a9 100644
--- a/thermal_info_config.json
+++ b/thermal_info_config.json
@@ -148,7 +148,8 @@
                 60.0
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001
+            "Multiplier":0.001,
+            "Monitor":true
         },
         {
             "Name":"usb_port_temp",
diff --git a/walleye/overlay/frameworks/base/core/res/res/values/config.xml b/walleye/overlay/frameworks/base/core/res/res/values/config.xml
index bae87f1..8d62506 100644
--- a/walleye/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/walleye/overlay/frameworks/base/core/res/res/values/config.xml
@@ -100,7 +100,7 @@
 
          This array should be equal in size to config_screenBrightnessBacklight. -->
     <integer-array name="config_screenBrightnessBacklight">
-        <item>0</item>
+        <item>1</item>
         <item>15</item>
         <item>30</item>
         <item>45</item>
@@ -128,7 +128,7 @@
 
          This array should be equal in size to config_screenBrightnessBacklight -->
     <array name="config_screenBrightnessNits">
-        <item>0</item>
+        <item>1.74</item>
         <item>26.11</item>
         <item>50.5</item>
         <item>74.17</item>
@@ -157,13 +157,20 @@
     <!-- Screen brightness when dozing. -->
     <integer name="config_screenBrightnessDoze">13</integer>
 
-    <!-- Default screen brightness setting.
-         Must be in the range specified by minimum and maximum. -->
-    <integer name="config_screenBrightnessSettingDefault">98</integer>
+    <!-- Minimum screen brightness setting allowed by power manager.
+         The user is forbidden from setting the brightness below this level.
+         Equivalent to 1/255. -->
+    <item name="config_screenBrightnessSettingMinimumFloat" format="float" type="dimen">0.0</item>
+
+    <!-- Maximum screen brightness allowed by the power manager.
+         The user is forbidden from setting the brightness above this level.
+         This value is a fraction between 3.5% and 100%. -->
+    <item name="config_screenBrightnessSettingMaximumFloat" format="float" type="dimen">1.0</item>
 
-    <!-- Minimum screen brightness setting allowed by the power manager.
-         The user is forbidden from setting the brightness below this level. -->
-    <integer name="config_screenBrightnessSettingMinimum">1</integer>
+    <!-- Default screen brightness setting
+         Must be in the range specified by minimum and maximum.
+         Equivalent to 98/255 (default for this device)    -->
+    <item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.38188976378</item>
 
     <!-- Values for USB port setting. in format of bootmode:current function:new function -->
     <string-array translatable="false" name="config_oemUsbModeOverride">
@@ -179,10 +186,6 @@
         <item>8</item>
     </integer-array>
 
-    <!-- Boolean indicating whether framework needs to set the tx power limit for meeting SAR
-         requirements -->
-    <bool translatable="false" name="config_wifi_framework_enable_sar_tx_power_limit">true</bool>
-
     <!-- Whether the display blanks itself when transitioning from a doze to a non-doze state -->
     <bool name="config_displayBlanksAfterDoze">true</bool>
 
@@ -193,11 +196,4 @@
     <!-- If true, the doze component is not started until after the screen has been
          turned off and the screen off animation has been performed. -->
     <bool name="config_dozeAfterScreenOff">true</bool>
-
-    <!-- Enable ACS (auto channel selection) for Wifi hotspot (SAP) -->
-    <bool translatable="false" name="config_wifi_softap_acs_supported">true</bool>
-
-    <!-- Enable 802.11ac for Wifi hotspot (SAP) -->
-    <bool translatable="false" name="config_wifi_softap_ieee80211ac_supported">true</bool>
-
 </resources>