From 5f50ac9ca0e7795a8e8d68077a5e1de8f446dad4 Mon Sep 17 00:00:00 2001
From: Long Ling <longling@google.com>
Date: Mon, 28 Jun 2021 15:31:30 -0700
Subject: [PATCH 1/3] display: update device color data

Bug: 191467644
Change-Id: I6d1aea14b458c4dfedade2949d765e0e79faf339
---
 oriole/display_colordata_dev_cal0.pb | Bin 1036 -> 947 bytes
 raven/display_colordata_dev_cal0.pb  | Bin 1020 -> 947 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/oriole/display_colordata_dev_cal0.pb b/oriole/display_colordata_dev_cal0.pb
index c9343cc2d37ef2a45758205413213ecc4c43e515..6b2b107f93451fb3e79fbb44110ab32a001b08c7 100644
GIT binary patch
delta 90
zcmeC-*v!tv<vx*FLsv3AH7~U&u_QG`A*oU!KP@dMGcQ%4BtJjLiP=xzQEMYJ7psAe
up{bG3a%Qf{4a_~8KQT!$a%*j7=3+NAHP$gRpPa}fI@zDGX0sim6e9qtR2bp_

delta 172
zcmdnY-owGnHJ@=JlSaK#dTL&3QDRAIib7JQLP}<FK~7?&LUMjievv{>W>QgNQKeIm
zV_r&8erAe(Vt#Q!e11`8eom@Bgt7|O_jL>oaShT>%}dwI$<IsA$<#A4FfueSF*eXM
zG&V6aGO#KwPAy7FO)5>-FG(#f(alb+EY{l0%*AeGV9KInVqmeElW7$rpVmfZE>;5_
UBLfqm<;+}@3mJPhK9*tx0E9L+i2wiq

diff --git a/raven/display_colordata_dev_cal0.pb b/raven/display_colordata_dev_cal0.pb
index ba2ea2caa6e0000da109887d5814949347964bf4..082bf72f68403a51fe437adcc1bdae732a65f48c 100644
GIT binary patch
delta 82
zcmeyvzL}kg%Y7oVhQ4HaYF=tlVo7R>LQ<tdep*^iW?rg7Nq&Bg6SJSbqt<3-E_Opx
mV;wVd6QSkIT$2l!dp18}l49i2+Q`hsYM^6iYP50ADn<Yb6&L3K

delta 161
zcmdnY{)e5JtDkWqlSaK#dTL&3QDRAIib7JQLP}<FK~7?&LUMjievv{>W>QgNQKgep
zdVYR-PO5%UVp(b)gtQ9Q4|Xwh)H5<PFflUJGcYjKb2QR7H#RUgFgCL)Elw>;NlhwE
z*H1|;)6Gt;EY{k{%*AS;V`N|=w49l%i;;^-fLEbGL2I)((;P+~t<B6_>_!HrIwl4d
J8$(wy0sv_^FN^>H


From ea3372d22ead8f49b84a392624d3a396dea83821 Mon Sep 17 00:00:00 2001
From: Michael Ayoubi <mayoubi@google.com>
Date: Wed, 30 Jun 2021 01:53:01 +0000
Subject: [PATCH 2/3] Update ro.gms.dck.eligible_wcc Property for R4.

Bug: 191415586
Test: Build

Signed-off-by: Michael Ayoubi <mayoubi@google.com>
Change-Id: Iaa7e6fa3ff96bcb794afd7ee908e40f559614aa5
---
 device-raven.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-raven.mk b/device-raven.mk
index 23f8f26..0e9c09d 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -139,7 +139,7 @@ PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.kb_pad_port_l=11
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.gms.dck.eligible_wcc=3
+    ro.gms.dck.eligible_wcc=2
 
 # SKU specific RROs
 PRODUCT_PACKAGES += \

From ab9201613bb72958d73daf51cd6e16c17c8cc06e Mon Sep 17 00:00:00 2001
From: Cheney Ni <cheneyni@google.com>
Date: Mon, 28 Jun 2021 13:47:54 +0800
Subject: [PATCH 3/3] Bluetooth: Enable AAC VBR by default

AAC VBR is more preferred than CBR for A2DP playback.

Bug: 192203000
Test: dumpsys bluetooth_manager
Change-Id: I8f758c102164da9936de7ddc0bb46e0a99279359
---
 device-oriole.mk   |  4 ++++
 device-raven.mk    |  4 ++++
 device-slider.mk   | 12 +++++-------
 device-whitefin.mk |  3 +++
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/device-oriole.mk b/device-oriole.mk
index eaed050..eb4038c 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -56,6 +56,10 @@ PRODUCT_COPY_FILES += \
 	device/google/raviole/thermal_info_config_oriole.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \
 	device/google/raviole/thermal_info_config_oriole_WHI_A.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_WHI_A.json
 
+# Bluetooth
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.a2dp_aac.vbr_supported=true
+
 # Bluetooth Tx power caps for oriole
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/bluetooth_power_limits_oriole.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv
diff --git a/device-raven.mk b/device-raven.mk
index 0e9c09d..b4f4e64 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -62,6 +62,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
 	device/google/raviole/thermal_info_config_raven.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json
 
+# Bluetooth
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.a2dp_aac.vbr_supported=true
+
 # Bluetooth Tx power caps for raven
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/bluetooth_power_limits_raven.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv
diff --git a/device-slider.mk b/device-slider.mk
index b50ad5f..f4e6b57 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -48,10 +48,12 @@ PRODUCT_COPY_FILES += \
     device/google/raviole/media_profiles_slider.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
 
 # Bluetooth
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.a2dp_aac.vbr_supported=true
+
+# Bluetooth default BDADDR for EVB only
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.bluetooth.a2dp_offload.supported=true \
-    persist.bluetooth.a2dp_offload.disabled=false \
-    persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
+    ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
 
 # SecureElement
 PRODUCT_PACKAGES += \
@@ -62,10 +64,6 @@ PRODUCT_COPY_FILES += \
     device/google/gs101/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf \
     device/google/gs101/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
 
-# default BDADDR for EVB only
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
-
 # NFC
 PRODUCT_COPY_FILES += \
 	device/google/raviole/nfc/libnfc-hal-st-disable.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \
diff --git a/device-whitefin.mk b/device-whitefin.mk
index a583358..17e4d45 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -51,6 +51,9 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.bluetooth.a2dp_offload.supported=false
 
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.a2dp_aac.vbr_supported=true
+
 # NFC
 PRODUCT_COPY_FILES += \
 	device/google/gs101/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf