[automerger skipped] Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future am: 5076337f3b -s ours
am skip reason: Merged-In Ibf7dda6c4c13d6513e2f08239c95c6b2778a98ec with SHA-1 45531bd711 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/28710570
Change-Id: I4e1e1ac23b9a8f424020343c4d7c88ce6e057bfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index a5e752d..08b3a73 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -366,7 +366,12 @@
BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_EXTRA = $(foreach k,$(BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES),$(if $(wildcard $(KERNEL_MODULE_DIR)/$(k)), $(k)))
# Kernel modules that are listed in vendor_boot.modules.load
-BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_boot.modules.load))
+# Starting from 6.1, use modules.load instead. It lists modules for vendor ramdisk regardless of the partition name.
+ifneq ($(wildcard $(KERNEL_MODULE_DIR)/modules.load),)
+ BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/modules.load))
+else
+ BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_boot.modules.load))
+endif
ifndef BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE
$(error vendor_boot.modules.load not found or empty)
endif
diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index 7185b2e..94b981c 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -137,16 +137,6 @@
write /sys/class/net/rmnet6/queues/rx-0/rps_cpus fe
write /sys/class/net/rmnet7/queues/rx-0/rps_cpus fe
- # Create UDS structure for base VR services.
- mkdir /dev/socket/pdx 0775 system system
- mkdir /dev/socket/pdx/system 0775 system system
- mkdir /dev/socket/pdx/system/buffer_hub 0775 system system
- mkdir /dev/socket/pdx/system/performance 0775 system system
- mkdir /dev/socket/pdx/system/vr 0775 system system
- mkdir /dev/socket/pdx/system/vr/display 0775 system system
- mkdir /dev/socket/pdx/system/vr/pose 0775 system system
- mkdir /dev/socket/pdx/system/vr/sensors 0775 system system
-
# Boot time 183626384
write /proc/vendor_sched/groups/ta/uclamp_min 201
write /proc/vendor_sched/groups/ta/prefer_idle 1
@@ -277,6 +267,7 @@
chown system system /sys/class/power_supply/wireless/device/version
chown system system /sys/class/power_supply/wireless/device/features
chown system system /sys/class/power_supply/wireless/device/authtype
+ chown system system /sys/class/power_supply/wireless/device/authtstart
# Adaptive charge
chown system system /sys/class/power_supply/battery/charge_deadline
@@ -702,6 +693,12 @@
write /dev/cpuset/camera-daemon/cpus ${persist.device_config.vendor_system_native.camera-daemon_cpuset:-0-7}
setprop vendor.powerhal.init 1
+ # Setup scheduler parameters
+ write /proc/vendor_sched/min_granularity_ns 1000000
+ write /proc/vendor_sched/latency_ns 8000000
+ write /proc/vendor_sched/max_load_balance_interval 1
+ write /proc/vendor_sched/enable_hrtick 1
+
# Setup final cpu.uclamp
write /proc/vendor_sched/groups/ta/uclamp_min 1
write /proc/vendor_sched/groups/fg/uclamp_min 0
@@ -854,50 +851,10 @@
write /sys/devices/virtual/pmic/mitigation/clock_ratio/gpu_heavy_clk_ratio 0xfff04385
write /sys/devices/virtual/pmic/mitigation/clock_ratio/tpu_heavy_clk_ratio 0xfff041c1
write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu2_heavy_clk_ratio 0xfff041c0
- write /dev/thermal/tz-by-name/smpl_gm/policy user_space
- write /dev/thermal/tz-by-name/vdroop1/policy user_space
- write /dev/thermal/tz-by-name/vdroop2/policy user_space
- write /dev/thermal/tz-by-name/ocp_cpu1/policy user_space
- write /dev/thermal/tz-by-name/ocp_cpu2/policy user_space
- write /dev/thermal/tz-by-name/ocp_tpu/policy user_space
- write /dev/thermal/tz-by-name/ocp_gpu/policy user_space
- write /dev/thermal/tz-by-name/soft_ocp_cpu1/policy user_space
- write /dev/thermal/tz-by-name/soft_ocp_cpu2/policy user_space
- write /dev/thermal/tz-by-name/soft_ocp_tpu/policy user_space
- write /dev/thermal/tz-by-name/soft_ocp_gpu/policy user_space
- write /dev/thermal/tz-by-name/soc/policy user_space
- write /dev/thermal/tz-by-name/batoilo/policy user_space
write /sys/devices/virtual/pmic/mitigation/triggered_lvl/smpl_lvl 3100
write /sys/devices/virtual/pmic/mitigation/clock_div/tpu_clk_div 0x1
write /sys/devices/virtual/pmic/mitigation/clock_div/gpu_clk_div 0x1
write /sys/devices/virtual/pmic/mitigation/clock_div/cpu2_clk_div 0x1
- chown system system /dev/thermal/tz-by-name/soc/mode
- chown system system /dev/thermal/tz-by-name/batoilo/trip_point_0_temp
- chown system system /dev/thermal/tz-by-name/batoilo/trip_point_0_hyst
- chown system system /dev/thermal/tz-by-name/vdroop2/trip_point_0_temp
- chown system system /dev/thermal/tz-by-name/vdroop2/trip_point_0_hyst
- chown system system /dev/thermal/tz-by-name/vdroop1/trip_point_0_temp
- chown system system /dev/thermal/tz-by-name/vdroop1/trip_point_0_hyst
- chown system system /dev/thermal/tz-by-name/smpl_gm/trip_point_0_temp
- chown system system /dev/thermal/tz-by-name/smpl_gm/trip_point_0_hyst
- chown system system /dev/thermal/tz-by-name/ocp_cpu1/trip_point_0_temp
- chown system system /dev/thermal/tz-by-name/ocp_cpu1/trip_point_0_hyst
- chown system system /dev/thermal/tz-by-name/ocp_cpu2/trip_point_0_temp
- chown system system /dev/thermal/tz-by-name/ocp_cpu2/trip_point_0_hyst
- chown system system /dev/thermal/tz-by-name/ocp_tpu/trip_point_0_temp
- chown system system /dev/thermal/tz-by-name/ocp_tpu/trip_point_0_hyst
- chown system system /dev/thermal/tz-by-name/ocp_gpu/trip_point_0_temp
- chown system system /dev/thermal/tz-by-name/ocp_gpu/trip_point_0_hyst
- chown system system /dev/thermal/tz-by-name/soft_ocp_cpu1/trip_point_0_temp
- chown system system /dev/thermal/tz-by-name/soft_ocp_cpu1/trip_point_0_hyst
- chown system system /dev/thermal/tz-by-name/soft_ocp_cpu2/trip_point_0_temp
- chown system system /dev/thermal/tz-by-name/soft_ocp_cpu2/trip_point_0_hyst
- chown system system /dev/thermal/tz-by-name/soft_ocp_tpu/trip_point_0_temp
- chown system system /dev/thermal/tz-by-name/soft_ocp_tpu/trip_point_0_hyst
- chown system system /dev/thermal/tz-by-name/soft_ocp_gpu/trip_point_0_temp
- chown system system /dev/thermal/tz-by-name/soft_ocp_gpu/trip_point_0_hyst
- chown system system /dev/thermal/tz-by-name/soc/trip_point_0_temp
- chown system system /dev/thermal/tz-by-name/soc/trip_point_0_hyst
# Thermal
chown system system /dev/thermal/tz-by-name/quiet_therm/trip_point_0_temp
chown system system /dev/thermal/tz-by-name/quiet_therm/trip_point_0_hyst
diff --git a/default-permissions.xml b/default-permissions.xml
index 3ba6011..4a3e1c6 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -171,4 +171,11 @@
<!-- Notifications -->
<permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
</exception>
+
+ <exception package="com.google.android.apps.pixel.relationships">
+ <!-- Contacts -->
+ <permission name="android.permission.READ_CALL_LOG" fixed="false"/>
+ <permission name="android.permission.READ_CONTACTS" fixed="false"/>
+ <permission name="android.permission.WRITE_CONTACTS" fixed="false"/>
+ </exception>
</exceptions>
diff --git a/device.mk b/device.mk
index 20b0e3a..0e42a04 100644
--- a/device.mk
+++ b/device.mk
@@ -76,7 +76,6 @@
vendor/google/whitechapel/tools \
vendor/google/camera \
vendor/google/interfaces \
- vendor/google_devices/common/proprietary/confirmatioui_hal \
vendor/google_nos/host/android \
vendor/google_nos/test/system-test-harness
@@ -186,6 +185,7 @@
# $(USE_LASSEN_OEMHOOK) is true and $(BOARD_WITHOUT_RADIO) is not true.
ifneq ($(BOARD_WITHOUT_RADIO),true)
PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril
+ $(call soong_config_set,sitril,use_lassen_oemhook_with_radio,true)
endif
# Use for GRIL
@@ -218,9 +218,18 @@
PRODUCT_PACKAGES += \
libGLES_mali \
vulkan.mali \
- libOpenCL \
libgpudataproducer
+# Install the OpenCL ICD Loader
+PRODUCT_SOONG_NAMESPACES += external/OpenCL-ICD-Loader
+PRODUCT_PACKAGES += \
+ libOpenCL \
+ mali_icd__customer_pixel_opencl-icd_ARM.icd
+ifeq ($(DEVICE_IS_64BIT_ONLY),false)
+PRODUCT_PACKAGES += \
+ mali_icd__customer_pixel_opencl-icd_ARM32.icd
+endif
+
PRODUCT_VENDOR_PROPERTIES += \
ro.hardware.vulkan=mali
@@ -231,7 +240,7 @@
PRODUCT_VENDOR_PROPERTIES += \
vendor.mali.platform.config=/vendor/etc/mali/platform.config \
vendor.mali.debug.config=/vendor/etc/mali/debug.config \
- vendor.mali.base_protected_max_core_count=3 \
+ vendor.mali.base_protected_max_core_count=4 \
vendor.mali.base_protected_tls_max=67108864 \
vendor.mali.platform_agt_frequency_khz=24576
@@ -277,6 +286,7 @@
DEVICE_MANIFEST_FILE := \
device/google/gs101/manifest$(LOCAL_64ONLY).xml
+BOARD_USE_CODEC2_AIDL := V1
ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
DEVICE_MANIFEST_FILE += \
device/google/gs101/manifest_media_aosp.xml
@@ -737,12 +747,19 @@
device/google/gs101/media_codecs_performance_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_c2.xml \
PRODUCT_PROPERTY_OVERRIDES += \
- debug.stagefright.c2-poolmask=458752 \
debug.c2.use_dmabufheaps=1 \
media.c2.dmabuf.padding=512 \
debug.stagefright.ccodec_delayed_params=1 \
ro.vendor.gpu.dataspace=1
+ifneq ($(BOARD_USE_CODEC2_AIDL), )
+PRODUCT_PROPERTY_OVERRIDES += \
+ debug.stagefright.c2-poolmask=1507328
+else
+PRODUCT_PROPERTY_OVERRIDES += \
+ debug.stagefright.c2-poolmask=458752
+endif
+
# Create input surface on the framework side
PRODUCT_PROPERTY_OVERRIDES += \
debug.stagefright.c2inputsurface=-1 \
@@ -804,8 +821,6 @@
trusty-ut-ctrl \
tipc-test
-include device/google/gs101/confirmationui/confirmationui.mk
-
include device/google/gs101/trusty_metricsd/trusty_metricsd.mk
PRODUCT_PACKAGES += \
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 95c2113..4536712 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -78,7 +78,7 @@
</hal>
<hal format="aidl" optional="true">
<name>com.google.hardware.pixel.display</name>
- <version>12</version>
+ <version>13</version>
<interface>
<name>IDisplay</name>
<instance>default</instance>
diff --git a/powerhint_a1.json b/powerhint_a1.json
index 7a980ba..e51765b 100644
--- a/powerhint_a1.json
+++ b/powerhint_a1.json
@@ -370,18 +370,6 @@
"Value": "DISABLE_TA_BOOST"
},
{
- "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
- "Node": "LimitFlashCurrent",
- "Duration": 0,
- "Value": "100"
- },
- {
- "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
- "Node": "LimitFlashCurrent",
- "Duration": 0,
- "Value": "1500"
- },
- {
"PowerHint": "EXPENSIVE_RENDERING",
"Node": "PowerHALRenderingState",
"Duration": 0,