From 0e2af5bf1dfb3ce3021c65afd180e340b6034d5e Mon Sep 17 00:00:00 2001
From: Carter Hsu <carterhsu@google.com>
Date: Thu, 20 Jul 2023 09:10:44 +0800
Subject: [PATCH 1/7] audio: add HDMI support on ripcurrent

Bug: 264508873
Test: build pass
Change-Id: I91cfd4b7e028927a5036f1772cfc6a5aa725d650
Signed-off-by: Carter Hsu <carterhsu@google.com>
---
 audio/ripcurrent/config/audio_platform_configuration.xml    | 1 +
 audio/ripcurrent/config/audio_policy_configuration.xml      | 4 +++-
 .../audio_policy_configuration_a2dp_offload_disabled.xml    | 4 +++-
 .../audio_policy_configuration_bluetooth_legacy_hal.xml     | 4 +++-
 .../audio_policy_configuration_le_offload_disabled.xml      | 4 +++-
 audio/ripcurrent/config/mixer_paths.xml                     | 6 ++++++
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/audio/ripcurrent/config/audio_platform_configuration.xml b/audio/ripcurrent/config/audio_platform_configuration.xml
index 1aab4e6..2435e98 100644
--- a/audio/ripcurrent/config/audio_platform_configuration.xml
+++ b/audio/ripcurrent/config/audio_platform_configuration.xml
@@ -295,6 +295,7 @@
     <device_handle>
         <handler libname="audio_bt_aoc.so"/>
         <handler libname="audio_usb_aoc.so" argu="MaxSamplingRate=192000,UnsupportedFormat=S24_LE,MaxCapPacketInterval=125,MaxCapSampleRate=192000,MaxCapBitWidth=32,MaxCapChannel=2,EnableHifi192kMultichannel=0"/>
+        <handler libname="audio_hdmi_aoc.so"/>
     </device_handle>
 
     <external_module>
diff --git a/audio/ripcurrent/config/audio_policy_configuration.xml b/audio/ripcurrent/config/audio_policy_configuration.xml
index c53bfe2..2620d7f 100644
--- a/audio/ripcurrent/config/audio_policy_configuration.xml
+++ b/audio/ripcurrent/config/audio_policy_configuration.xml
@@ -148,7 +148,7 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
                 </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
@@ -227,6 +227,8 @@
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
                 <route type="mix" sink="USB Headset Out"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
+                <route type="mix" sink="HDMI Out"
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
diff --git a/audio/ripcurrent/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/ripcurrent/config/audio_policy_configuration_a2dp_offload_disabled.xml
index 6352aac..2fffbfa 100644
--- a/audio/ripcurrent/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/ripcurrent/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -148,7 +148,7 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
                 </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
@@ -183,6 +183,8 @@
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
                 <route type="mix" sink="USB Headset Out"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
+                <route type="mix" sink="HDMI Out"
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
diff --git a/audio/ripcurrent/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/ripcurrent/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index e80ded5..7b32451 100644
--- a/audio/ripcurrent/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/ripcurrent/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -144,7 +144,7 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
                 </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
@@ -179,6 +179,8 @@
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback"/>
                 <route type="mix" sink="USB Headset Out"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback"/>
+                <route type="mix" sink="HDMI Out"
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,deep buffer,haptic,voip_rx,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
diff --git a/audio/ripcurrent/config/audio_policy_configuration_le_offload_disabled.xml b/audio/ripcurrent/config/audio_policy_configuration_le_offload_disabled.xml
index 3fdeb3f..ce7f29d 100644
--- a/audio/ripcurrent/config/audio_policy_configuration_le_offload_disabled.xml
+++ b/audio/ripcurrent/config/audio_policy_configuration_le_offload_disabled.xml
@@ -148,7 +148,7 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
                 </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
@@ -204,6 +204,8 @@
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
                 <route type="mix" sink="USB Headset Out"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
+                <route type="mix" sink="HDMI Out"
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
diff --git a/audio/ripcurrent/config/mixer_paths.xml b/audio/ripcurrent/config/mixer_paths.xml
index 6bbe394..743e247 100644
--- a/audio/ripcurrent/config/mixer_paths.xml
+++ b/audio/ripcurrent/config/mixer_paths.xml
@@ -700,6 +700,12 @@
         <ctl name="R Main AMP Enable Switch" value="1"/>
     </path>
 
+    <path name="hdmi">
+    </path>
+
+    <path name="hdmi-post">
+    </path>
+
     <path name="speaker-safe">
         <ctl name="R Main AMP Enable Switch" value="1"/>
     </path>

From ad520e59a4d52f3ef427bfcc74457d7aeba370ea Mon Sep 17 00:00:00 2001
From: Cheng Chang <chengcha@google.com>
Date: Mon, 26 Jun 2023 03:32:50 +0000
Subject: [PATCH 2/7] gps: separate gps build system to device

Bug: 288813677
Test: compile for different devices and check binary.
Test: verification test at b/288813677
Change-Id: I7591af58423d4d2826a7c5e9ba166ed0e729d932
---
 device-husky.mk      | 10 ++++++++++
 device-ripcurrent.mk | 10 ++++++++++
 device-shiba.mk      | 10 ++++++++++
 3 files changed, 30 insertions(+)

diff --git a/device-husky.mk b/device-husky.mk
index e61db63..0664d09 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -238,6 +238,16 @@ PRODUCT_PACKAGES += \
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
 
 # Location
+# SDK build system
+ifneq ($(BOARD_WITHOUT_RADIO),true)
+# Release stable version to factory image
+ifneq ($(filter factory_%,$(TARGET_PRODUCT)),)
+	include device/google/gs-common/gps/brcm/device.mk
+else
+	include device/google/gs-common/gps/brcm/device_v2.mk
+endif
+endif
+
 PRODUCT_COPY_FILES += \
        device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer
 
diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk
index 87ce735..77d5c9b 100644
--- a/device-ripcurrent.mk
+++ b/device-ripcurrent.mk
@@ -203,6 +203,16 @@ PRODUCT_PACKAGES += \
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
 
 # Location
+# SDK build system
+ifneq ($(BOARD_WITHOUT_RADIO),true)
+# Release stable version to factory image
+ifneq ($(filter factory_%,$(TARGET_PRODUCT)),)
+	include device/google/gs-common/gps/brcm/device.mk
+else
+	include device/google/gs-common/gps/brcm/device_v2.mk
+endif
+endif
+
 PRODUCT_COPY_FILES += \
        device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer
 
diff --git a/device-shiba.mk b/device-shiba.mk
index 1737971..b0e7927 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -229,6 +229,16 @@ PRODUCT_PACKAGES += \
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
 
 # Location
+# SDK build system
+ifneq ($(BOARD_WITHOUT_RADIO),true)
+# Release stable version to factory image
+ifneq ($(filter factory_%,$(TARGET_PRODUCT)),)
+	include device/google/gs-common/gps/brcm/device.mk
+else
+	include device/google/gs-common/gps/brcm/device_v2.mk
+endif
+endif
+
 PRODUCT_COPY_FILES += \
        device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer
 

From f95304254b1d9ef4a0b34d31c2392d2d42dbf45c Mon Sep 17 00:00:00 2001
From: Evan Laird <evanlaird@google.com>
Date: Thu, 6 Jul 2023 16:06:53 -0400
Subject: [PATCH 3/7] Manually tune rounded_corner_radius for Husky

Built and tested on Husky. Tested by setting a gray wallpaper and
getting the rounded corner rect to apply via begnning a gesture nav
event.

Test: manual
Bug: 284742800
Change-Id: I5b8121311bddbda10ff19df2bfc4e1f9cedd9d23
(cherry picked from commit 275d998342fa1af455b561a249bb4757f2dfb016)
---
 .../overlay/frameworks/base/core/res/res/values/dimens.xml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/husky/overlay/frameworks/base/core/res/res/values/dimens.xml b/husky/overlay/frameworks/base/core/res/res/values/dimens.xml
index 945f37a..8fa69f3 100644
--- a/husky/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/husky/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -19,9 +19,9 @@
 
 <resources>
     <!-- Radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius">115px</dimen>
-    <dimen name="rounded_corner_radius_top">118px</dimen>
-    <dimen name="rounded_corner_radius_bottom">115px</dimen>
+    <dimen name="rounded_corner_radius">91px</dimen>
+    <dimen name="rounded_corner_radius_top">91px</dimen>
+    <dimen name="rounded_corner_radius_bottom">91px</dimen>
 
     <!-- Height of the status bar.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.

From b25f3e337ae63abc28cdb84e906dc953946b9c55 Mon Sep 17 00:00:00 2001
From: Karuna Ramkumar <rkaruna@google.com>
Date: Fri, 28 Jul 2023 14:56:31 -0700
Subject: [PATCH 4/7] display: sb3: bigsurf: smooth display golden cal

Bug: 293651820
Test: check displaycolor dump and log
Change-Id: Ib05103d20447361220a57656f2cfcda4157edca9
---
 shiba/display_golden_google-bigsurf_cal0.pb | Bin 119261 -> 120735 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/shiba/display_golden_google-bigsurf_cal0.pb b/shiba/display_golden_google-bigsurf_cal0.pb
index 32de5d685fe4eb9719fcce55862ac3deb0cf0978..25dd2fba0745ef514a7d5d15f18abe3a482f0855 100644
GIT binary patch
delta 329
zcmcb+n0@|w_6aLCYrjx^F>$#ZYv&_IF15*lFVr@N6hACrR(kMcvfm4%jX(8^rbnM)
ztl7N&SvBKk(<lEJrw3eMTsJ-NB4gO}zZV#Tr!T+AXeMOzikXYU(8xf?(8S0>=q@wY
zoXH=a1@QTBF$wSpuqynQ*K%ZNne^O&5sP@!r04cbQdlH_8ti$Do-uQ=gG{zGHk|DH
zEQz)5ALBo!$pufWCkH-@gY&EyrBL~TMlYcnP0Y;UE)qg<Q5WMBrl!gHPi!F0LX~V`
V>|kmEN?JqRhAP{^I03BH8UXsIcrgF~

delta 73
zcmV-P0Ji_1uLs?u2au?f&gdNl;N$@cE|c)+CbuJ60XTBA>gWw|lh5XZx7E%8djYpw
f%mMcSv8N{Jmr&3Fu9sEO0aBO!&;eJMr_lj6O^YN)


From 0e6a75195e9b59fd5469fe483d4bdd0258cebb40 Mon Sep 17 00:00:00 2001
From: Karuna Ramkumar <rkaruna@google.com>
Date: Fri, 28 Jul 2023 15:26:35 -0700
Subject: [PATCH 5/7] display: sb3: shoreline: smooth display golden cal

Bug: 293651820
Test: check displaycolor dump and log
Change-Id: Icc92ad5f144898d89666a81c1cb4e594c6e16f66
---
 shiba/display_golden_google-shoreline_cal0.pb | Bin 119215 -> 121175 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/shiba/display_golden_google-shoreline_cal0.pb b/shiba/display_golden_google-shoreline_cal0.pb
index 592f8cc9a5f3ddadc0ab75bec87a9df1fb527179..3e67b8c4c9b24c66c9d45316ae67db90fd09015c 100644
GIT binary patch
delta 441
zcmZ3#nEm=D_6bKfHx#}tVp7^ZJtCS>d*jExg3Y;41X#9*M>8HTU{bm^xv|iA^TroT
zizeqjso6gD9Ah=(cDXZ*zZsd8<}gpsy1*DbUHAfH_;i7bKw>Y5n|_heL&)ekGZ%-U
zk%5kpshO$JEoQFS(;uE;448c92`^*y^!~Gq_KfHvc1%(jLV`vwnYq|O=9n6p3f*Pq
zngcdQ+=q)vfJcB;;lI3=BSQn@TgF>VADADoOn&&(oROdsGbSm*Y6Oj*L2b4)FhunL
pbHxY7=@ZW~+9G)YCT4@|3AiA_Ff&sNG{cIXU>XJ$Lp2O02mqK)tjYiY

delta 85
zcmcb<iGBTI_6bKBw@<Enp}qNjabLm4Bkzi)%bj7Y+5Ga!6z1)&k&HKsHrKp3QLtU~
o9OG}s?LevTjLb@Nn5U;*U<{uwe1S1|y2wQ!u@}TmzsTqT07WP$L;wH)


From 34bdf990c8a2f96788a1a1b905e37f02d1db40c7 Mon Sep 17 00:00:00 2001
From: Carter Hsu <carterhsu@google.com>
Date: Fri, 28 Jul 2023 10:51:26 +0800
Subject: [PATCH 6/7] audio: udpate CCA default value

Bug: 293550905
Test: build pass
Change-Id: I0946b88e4fd5d3b86f4d25fd4729b29ff1ef2dac
Signed-off-by: Carter Hsu <carterhsu@google.com>
---
 device-husky.mk | 4 ++++
 device-shiba.mk | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/device-husky.mk b/device-husky.mk
index e61db63..e6af542 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -123,6 +123,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_PROPERTY_OVERRIDES += \
        ro.audio.spatializer_enabled=true
 
+# Audio CCA property
+PRODUCT_PROPERTY_OVERRIDES += \
+	persist.vendor.audio.cca.enabled=false
+
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.gms.dck.eligible_wcc=3 \
diff --git a/device-shiba.mk b/device-shiba.mk
index 1737971..4f4ea74 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -115,6 +115,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_PROPERTY_OVERRIDES += \
        ro.audio.spatializer_enabled=true
 
+# Audio CCA property
+PRODUCT_PROPERTY_OVERRIDES += \
+	persist.vendor.audio.cca.enabled=false
+
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.gms.dck.eligible_wcc=2 \

From 407132b1af86658acc82e6de457da3b1ff3d58aa Mon Sep 17 00:00:00 2001
From: Wayne Lin <waynewhlin@google.com>
Date: Mon, 31 Jul 2023 15:27:58 +0800
Subject: [PATCH 7/7] gps: remove unused sensors

Bug: 291538679
Test: Verify driving test and VDR engaged rate doesn't impact
Change-Id: Id818a6caba7170190da7d5e50f236a8121d2668c
---
 location/gps.xml          | 1 +
 location/gps.xml.hk3      | 1 +
 location/gps.xml.sb3      | 1 +
 location/gps_user.xml     | 1 +
 location/gps_user.xml.hk3 | 1 +
 location/gps_user.xml.sb3 | 1 +
 6 files changed, 6 insertions(+)

diff --git a/location/gps.xml b/location/gps.xml
index 87364f4..7fd151a 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -62,6 +62,7 @@
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
        MaxThreadNum="13"
+       SensorsMask="0x244"
   />
 
   <gll
diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3
index 76c61b0..61e3625 100644
--- a/location/gps.xml.hk3
+++ b/location/gps.xml.hk3
@@ -62,6 +62,7 @@
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
        MaxThreadNum="13"
+       SensorsMask="0x244"
   />
 
   <gll
diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3
index 4a011fa..c1fe15b 100644
--- a/location/gps.xml.sb3
+++ b/location/gps.xml.sb3
@@ -62,6 +62,7 @@
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
        MaxThreadNum="13"
+       SensorsMask="0x244"
   />
 
   <gll
diff --git a/location/gps_user.xml b/location/gps_user.xml
index 5ae707e..86fa5e3 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -61,6 +61,7 @@
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
        MaxThreadNum="13"
+       SensorsMask="0x244"
   />
 
   <gll
diff --git a/location/gps_user.xml.hk3 b/location/gps_user.xml.hk3
index 8baba1d..27d43ef 100644
--- a/location/gps_user.xml.hk3
+++ b/location/gps_user.xml.hk3
@@ -61,6 +61,7 @@
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
        MaxThreadNum="13"
+       SensorsMask="0x244"
   />
 
   <gll
diff --git a/location/gps_user.xml.sb3 b/location/gps_user.xml.sb3
index aee51dc..62af598 100644
--- a/location/gps_user.xml.sb3
+++ b/location/gps_user.xml.sb3
@@ -61,6 +61,7 @@
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
        MaxThreadNum="13"
+       SensorsMask="0x244"
   />
 
   <gll