diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index fc957580..fc6a3073 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -250,6 +250,9 @@ on init
# Wireless Charge stats (write 0)
chown system system /sys/class/power_supply/wireless/device/charge_stats
+ # Thermal Charge stats (write 0)
+ chown system system /sys/devices/platform/google,charger/thermal_stats
+
# Permission for wireless charging
chown system system /sys/class/power_supply/wireless/capacity
chown system system /sys/class/power_supply/wireless/device/rtx
diff --git a/device.mk b/device.mk
index 3af75804..927d413d 100644
--- a/device.mk
+++ b/device.mk
@@ -128,29 +128,40 @@ PRODUCT_PRODUCT_PROPERTIES += \
PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.radio.config.carrier_config_dir=/mnt/vendor/modem_img/images/default/confpack
+# Set the Bluetooth Class of Device
+# Service Field: 0x5A -> 90
+# Bit 17: Networking
+# Bit 19: Capturing
+# Bit 20: Object Transfer
+# Bit 22: Telephony
+# MAJOR_CLASS: 0x02 -> 2 (Phone)
+# MINOR_CLASS: 0x0C -> 12 (Smart Phone)
+PRODUCT_PRODUCT_PROPERTIES += \
+ bluetooth.device.class_of_device=90,2,12
+
# Set supported Bluetooth profiles to enabled
PRODUCT_PRODUCT_PROPERTIES += \
- bluetooth.profile.asha.central.enabled=true \
- bluetooth.profile.a2dp.source.enabled=true \
- bluetooth.profile.avrcp.target.enabled=true \
- bluetooth.profile.bap.broadcast.assist.enabled=true \
- bluetooth.profile.bap.unicast.client.enabled=true \
- bluetooth.profile.bas.client.enabled=true \
- bluetooth.profile.csip.set_coordinator.enabled=true \
- bluetooth.profile.gatt.enabled=true \
- bluetooth.profile.hap.client.enabled=true \
- bluetooth.profile.hfp.ag.enabled=true \
- bluetooth.profile.hid.device.enabled=true \
- bluetooth.profile.hid.host.enabled=true \
- bluetooth.profile.map.server.enabled=true \
- bluetooth.profile.mcp.server.enabled=true \
- bluetooth.profile.opp.enabled=true \
- bluetooth.profile.pan.nap.enabled=true \
- bluetooth.profile.pan.panu.enabled=true \
- bluetooth.profile.pbap.server.enabled=true \
- bluetooth.profile.sap.server.enabled=true \
- bluetooth.profile.ccp.server.enabled=true \
- bluetooth.profile.vcp.controller.enabled=true
+ bluetooth.profile.asha.central.enabled?=true \
+ bluetooth.profile.a2dp.source.enabled?=true \
+ bluetooth.profile.avrcp.target.enabled?=true \
+ bluetooth.profile.bap.broadcast.assist.enabled?=true \
+ bluetooth.profile.bap.unicast.client.enabled?=true \
+ bluetooth.profile.bas.client.enabled?=true \
+ bluetooth.profile.csip.set_coordinator.enabled?=true \
+ bluetooth.profile.gatt.enabled?=true \
+ bluetooth.profile.hap.client.enabled?=true \
+ bluetooth.profile.hfp.ag.enabled?=true \
+ bluetooth.profile.hid.device.enabled?=true \
+ bluetooth.profile.hid.host.enabled?=true \
+ bluetooth.profile.map.server.enabled?=true \
+ bluetooth.profile.mcp.server.enabled?=true \
+ bluetooth.profile.opp.enabled?=true \
+ bluetooth.profile.pan.nap.enabled?=true \
+ bluetooth.profile.pan.panu.enabled?=true \
+ bluetooth.profile.pbap.server.enabled?=true \
+ bluetooth.profile.sap.server.enabled?=true \
+ bluetooth.profile.ccp.server.enabled?=true \
+ bluetooth.profile.vcp.controller.enabled?=true
PRODUCT_PROPERTY_OVERRIDES += \
telephony.active_modems.max_count=2
@@ -661,6 +672,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.earlyGl.sf.duration=16600000
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.earlyGl.app.duration=16600000
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.frame_rate_multiple_threshold=120
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.layer_caching_active_layer_timeout_ms=1000
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.treat_170m_as_sRGB=1
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.enable_layer_caching=true
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms?=80
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index ca391e54..03f456fa 100644
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -866,8 +866,7 @@ void DumpstateDevice::dumpMemorySection(int fd) {
"fi; "
"done"});
DumpFileToFd(fd, "dmabuf info", "/d/dma_buf/bufinfo");
- DumpFileToFd(fd, "Page Pinner - longterm pin", "/sys/kernel/debug/page_pinner/longterm_pinner");
- DumpFileToFd(fd, "Page Pinner - alloc_contig_failed", "/sys/kernel/debug/page_pinner/alloc_contig_failed");
+ DumpFileToFd(fd, "Page Pinner - longterm pin", "/sys/kernel/debug/page_pinner/buffer");
RunCommandToFd(fd, "Pixel CMA stat", {"/vendor/bin/sh", "-c",
"for d in $(ls -d /sys/kernel/pixel_stat/mm/cma/*); do "
"if [ -f $d ]; then "
diff --git a/gnss/47765/Android.bp b/gnss/47765/Android.bp
index 4843b23d..47ac1685 100644
--- a/gnss/47765/Android.bp
+++ b/gnss/47765/Android.bp
@@ -42,7 +42,7 @@ cc_prebuilt_library_shared {
"android.hardware.gnss@2.1",
"android.hardware.gnss.measurement_corrections@1.0",
"android.hardware.gnss.visibility_control@1.0",
- "android.hardware.gnss-V1-ndk",
+ "android.hardware.gnss-V2-ndk",
"libhardware",
"libc++",
"libc",
@@ -77,6 +77,7 @@ cc_prebuilt_binary {
"android.hardware.gnss@1.1",
"android.hardware.gnss@2.0",
"android.hardware.gnss@2.1",
+ "android.hardware.gnss-V2-ndk",
"libc++",
"libc",
"libm",
diff --git a/gnss/47765/android.hardware.gnss@2.1-service-brcm.xml b/gnss/47765/android.hardware.gnss@2.1-service-brcm.xml
index 1eb3509e..97538b88 100644
--- a/gnss/47765/android.hardware.gnss@2.1-service-brcm.xml
+++ b/gnss/47765/android.hardware.gnss@2.1-service-brcm.xml
@@ -1,16 +1,7 @@
-
- android.hardware.gnss
- hwbinder
- 2.1
- 1.1
-
- IGnss
- default
-
-
android.hardware.gnss
+ 2
IGnss/default
diff --git a/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so b/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so
index 48d5336d..722995d5 100755
Binary files a/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so and b/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so differ
diff --git a/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm b/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm
index b679b152..5c821400 100755
Binary files a/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm and b/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm differ
diff --git a/gnss/47765/bin/flp.default.so b/gnss/47765/bin/flp.default.so
index 226f61ad..684fd210 100755
Binary files a/gnss/47765/bin/flp.default.so and b/gnss/47765/bin/flp.default.so differ
diff --git a/gnss/47765/bin/gps.default.so b/gnss/47765/bin/gps.default.so
index 808f08f9..67eda7a5 100755
Binary files a/gnss/47765/bin/gps.default.so and b/gnss/47765/bin/gps.default.so differ
diff --git a/gnss/47765/bin/gpsd b/gnss/47765/bin/gpsd
index 2d1d8ac4..7cb22a4d 100755
Binary files a/gnss/47765/bin/gpsd and b/gnss/47765/bin/gpsd differ
diff --git a/gnss/47765/bin/lhd b/gnss/47765/bin/lhd
index ec4c7709..6d59cba3 100755
Binary files a/gnss/47765/bin/lhd and b/gnss/47765/bin/lhd differ
diff --git a/gnss/47765/bin/scd b/gnss/47765/bin/scd
index f9643526..bcd484d5 100755
Binary files a/gnss/47765/bin/scd and b/gnss/47765/bin/scd differ
diff --git a/gnss/47765/firmware/SensorHub.patch b/gnss/47765/firmware/SensorHub.patch
index 5cdc8b50..7a5d41ab 100644
--- a/gnss/47765/firmware/SensorHub.patch
+++ b/gnss/47765/firmware/SensorHub.patch
@@ -1,35 +1,35 @@
-
-
+
+
-
+
-
+0002000000C6FF00000000000000000000000000000000
+0000000000000000000000000000000000000000000000
+0000000200000007000000>
diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml
index a60791cc..7000661b 100644
--- a/media_codecs_performance_c2.xml
+++ b/media_codecs_performance_c2.xml
@@ -71,10 +71,8 @@
-
-
-
-
+
+
@@ -133,7 +131,9 @@
-
+
+
+
@@ -179,8 +179,7 @@
-
-
+
@@ -189,8 +188,7 @@
-
-
+
@@ -209,29 +207,20 @@
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+
@@ -248,8 +237,7 @@
-
-
+
@@ -257,5 +245,10 @@
+
+
+
+
+
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 1a7681e3..1be46320 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -141,4 +141,7 @@
1: verbose logging on by default for userdebug
2: verbose logging on by default for all builds -->
1
+
+
+ true