[automerger skipped] Merge Android 14 QPR1 am: d815a6775f -s ours am: d372ef70ff -s ours am: 31e614038a -s ours
am skip reason: Merged-In I484f4446b915cad1347dd065f2539cc12c75beec with SHA-1 e8cf7e19a1 is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2863573
Change-Id: I5e8c5e70ff6b013d65d04ca84a1b6c92bd646bc2
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 723b6b6..e1d6cd4 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -233,7 +233,7 @@
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
$(call soong_config_set,aoc_audio_func,dump_usecase_data,true)
$(call soong_config_set,aoc_audio_func,hal_socket_control,true)
-$(call soong_config_set,aoc_audio_func,record_tunning_keys,true)
+$(call soong_config_set,aoc_audio_func,record_tuning_keys,true)
endif
ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
diff --git a/OWNERS b/OWNERS
index 1cbf919..4bdbb97 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,2 @@
# per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
-per-file *.mk=file:device/google/gs-common:master:/OWNERS
+per-file *.mk=file:device/google/gs-common:main:/OWNERS
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
new file mode 100644
index 0000000..37ebb5e
--- /dev/null
+++ b/PREUPLOAD.cfg
@@ -0,0 +1,2 @@
+[Builtin Hooks]
+jsonlint = true
diff --git a/conf/init.check_ap_pd_auth.sh b/conf/init.check_ap_pd_auth.sh
new file mode 100644
index 0000000..8175e75
--- /dev/null
+++ b/conf/init.check_ap_pd_auth.sh
@@ -0,0 +1,15 @@
+#!/vendor/bin/sh
+
+# This script sets up `ro.vendor.sjtag_ap_is_unlocked` for the non-fused
+# device. For a fused device, this property should be set by
+# betterbug->ss-restart-detector when PD is acquired.
+
+SJTAG_STATUS=0x$(cat /sys/devices/platform/sjtag_ap/interface/status)
+SOFT_LOCK_BIT=4
+AUTH_PASS_BIT=8
+
+# Unlocked or locked but auth passed.
+if test "$((SJTAG_STATUS & (1 << SOFT_LOCK_BIT)))" = 0 -o \
+ "$((SJTAG_STATUS & (1 << AUTH_PASS_BIT)))" != 0 ; then
+ setprop ro.vendor.sjtag_ap_is_unlocked true
+fi
diff --git a/conf/init.debug.rc b/conf/init.debug.rc
index d4de2c8..3f8be42 100644
--- a/conf/init.debug.rc
+++ b/conf/init.debug.rc
@@ -39,7 +39,13 @@
on property:ro.revision=EVT1.0
setprop debug.hypervisor.metrics_tag "hwrev_a0"
-# Enable etm/etm2dram when ramdump is enabled.
-on property:ro.boot.ramdump=enabled
+service vendor.check_ap_pd_auth_sh /vendor/bin/init.check_ap_pd_auth.sh
+ class main
+ user root
+ group root system
+ oneshot
+
+# Enable etm/etm2dram when ramdump is enabled, and ap-sjtag is unlocked.
+on property:ro.boot.ramdump=enabled && property:ro.vendor.sjtag_ap_is_unlocked=true
write /sys/devices/platform/exynos-etm/etm_on 1
write /sys/devices/platform/etm2dram/arm 1
diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 847c261..4c6da6d 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -27,30 +27,30 @@
write /dev/sys/fs/by-name/userdata/data_io_flag 56
write /dev/sys/fs/by-name/userdata/node_io_flag 56
- chown system system /proc/vendor_sched/set_task_group_bg
- chown system system /proc/vendor_sched/set_task_group_cam
- chown system system /proc/vendor_sched/set_task_group_fg
- chown system system /proc/vendor_sched/set_task_group_nnapi
- chown system system /proc/vendor_sched/set_task_group_sys
- chown system system /proc/vendor_sched/set_task_group_sysbg
- chown system system /proc/vendor_sched/set_task_group_ta
- chown system system /proc/vendor_sched/set_task_group_rt
- chown system system /proc/vendor_sched/set_task_group_sf
- chown system system /proc/vendor_sched/set_task_group_dex2oat
- chown system system /proc/vendor_sched/set_task_group_cam_power
- chown system system /proc/vendor_sched/set_task_group_ota
- chown system system /proc/vendor_sched/set_proc_group_bg
- chown system system /proc/vendor_sched/set_proc_group_cam
- chown system system /proc/vendor_sched/set_proc_group_fg
- chown system system /proc/vendor_sched/set_proc_group_nnapi
- chown system system /proc/vendor_sched/set_proc_group_sys
- chown system system /proc/vendor_sched/set_proc_group_sysbg
- chown system system /proc/vendor_sched/set_proc_group_ta
- chown system system /proc/vendor_sched/set_proc_group_rt
- chown system system /proc/vendor_sched/set_proc_group_sf
- chown system system /proc/vendor_sched/set_proc_group_dex2oat
- chown system system /proc/vendor_sched/set_proc_group_cam_power
- chown system system /proc/vendor_sched/set_proc_group_ota
+ chown system system /proc/vendor_sched/groups/bg/set_task_group
+ chown system system /proc/vendor_sched/groups/cam/set_task_group
+ chown system system /proc/vendor_sched/groups/fg/set_task_group
+ chown system system /proc/vendor_sched/groups/nnapi/set_task_group
+ chown system system /proc/vendor_sched/groups/sys/set_task_group
+ chown system system /proc/vendor_sched/groups/sys_bg/set_task_group
+ chown system system /proc/vendor_sched/groups/ta/set_task_group
+ chown system system /proc/vendor_sched/groups/rt/set_task_group
+ chown system system /proc/vendor_sched/groups/sf/set_task_group
+ chown system system /proc/vendor_sched/groups/dex2oat/set_task_group
+ chown system system /proc/vendor_sched/groups/cam_power/set_task_group
+ chown system system /proc/vendor_sched/groups/ota/set_task_group
+ chown system system /proc/vendor_sched/groups/bg/set_proc_group
+ chown system system /proc/vendor_sched/groups/cam/set_proc_group
+ chown system system /proc/vendor_sched/groups/fg/set_proc_group
+ chown system system /proc/vendor_sched/groups/nnapi/set_proc_group
+ chown system system /proc/vendor_sched/groups/sys/set_proc_group
+ chown system system /proc/vendor_sched/groups/sys_bg/set_proc_group
+ chown system system /proc/vendor_sched/groups/ta/set_proc_group
+ chown system system /proc/vendor_sched/groups/rt/set_proc_group
+ chown system system /proc/vendor_sched/groups/sf/set_proc_group
+ chown system system /proc/vendor_sched/groups/dex2oat/set_proc_group
+ chown system system /proc/vendor_sched/groups/cam_power/set_proc_group
+ chown system system /proc/vendor_sched/groups/ota/set_proc_group
chown system system /proc/vendor_sched/prefer_idle_set
chown system system /proc/vendor_sched/prefer_idle_clear
chown system system /proc/vendor_sched/pmu_poll_enable
@@ -76,30 +76,30 @@
chown system system /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu6_memlat@17000010/memlat_cpuidle_state_aware
chown system system /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu7_memlat@17000010/memlat_cpuidle_state_aware
- chmod 0220 /proc/vendor_sched/set_task_group_bg
- chmod 0220 /proc/vendor_sched/set_task_group_cam
- chmod 0220 /proc/vendor_sched/set_task_group_fg
- chmod 0220 /proc/vendor_sched/set_task_group_nnapi
- chmod 0220 /proc/vendor_sched/set_task_group_sys
- chmod 0220 /proc/vendor_sched/set_task_group_sysbg
- chmod 0220 /proc/vendor_sched/set_task_group_ta
- chmod 0220 /proc/vendor_sched/set_task_group_rt
- chmod 0220 /proc/vendor_sched/set_task_group_sf
- chmod 0220 /proc/vendor_sched/set_task_group_dex2oat
- chmod 0220 /proc/vendor_sched/set_task_group_cam_power
- chmod 0220 /proc/vendor_sched/set_task_group_ota
- chmod 0220 /proc/vendor_sched/set_proc_group_bg
- chmod 0220 /proc/vendor_sched/set_proc_group_cam
- chmod 0220 /proc/vendor_sched/set_proc_group_fg
- chmod 0220 /proc/vendor_sched/set_proc_group_nnapi
- chmod 0220 /proc/vendor_sched/set_proc_group_sys
- chmod 0220 /proc/vendor_sched/set_proc_group_sysbg
- chmod 0220 /proc/vendor_sched/set_proc_group_ta
- chmod 0220 /proc/vendor_sched/set_proc_group_rt
- chmod 0220 /proc/vendor_sched/set_proc_group_sf
- chmod 0220 /proc/vendor_sched/set_proc_group_dex2oat
- chmod 0220 /proc/vendor_sched/set_proc_group_cam_power
- chmod 0220 /proc/vendor_sched/set_proc_group_ota
+ chmod 0220 /proc/vendor_sched/groups/bg/set_task_group
+ chmod 0220 /proc/vendor_sched/groups/cam/set_task_group
+ chmod 0220 /proc/vendor_sched/groups/fg/set_task_group
+ chmod 0220 /proc/vendor_sched/groups/nnapi/set_task_group
+ chmod 0220 /proc/vendor_sched/groups/sys/set_task_group
+ chmod 0220 /proc/vendor_sched/groups/sys_bg/set_task_group
+ chmod 0220 /proc/vendor_sched/groups/ta/set_task_group
+ chmod 0220 /proc/vendor_sched/groups/rt/set_task_group
+ chmod 0220 /proc/vendor_sched/groups/sf/set_task_group
+ chmod 0220 /proc/vendor_sched/groups/dex2oat/set_task_group
+ chmod 0220 /proc/vendor_sched/groups/cam_power/set_task_group
+ chmod 0220 /proc/vendor_sched/groups/ota/set_task_group
+ chmod 0220 /proc/vendor_sched/groups/bg/set_proc_group
+ chmod 0220 /proc/vendor_sched/groups/cam/set_proc_group
+ chmod 0220 /proc/vendor_sched/groups/fg/set_proc_group
+ chmod 0220 /proc/vendor_sched/groups/nnapi/set_proc_group
+ chmod 0220 /proc/vendor_sched/groups/sys/set_proc_group
+ chmod 0220 /proc/vendor_sched/groups/sys_bg/set_proc_group
+ chmod 0220 /proc/vendor_sched/groups/ta/set_proc_group
+ chmod 0220 /proc/vendor_sched/groups/rt/set_proc_group
+ chmod 0220 /proc/vendor_sched/groups/sf/set_proc_group
+ chmod 0220 /proc/vendor_sched/groups/dex2oat/set_proc_group
+ chmod 0220 /proc/vendor_sched/groups/cam_power/set_proc_group
+ chmod 0220 /proc/vendor_sched/groups/ota/set_proc_group
chmod 0220 /proc/vendor_sched/prefer_idle_set
chmod 0220 /proc/vendor_sched/prefer_idle_clear
chmod 0220 /proc/vendor_sched/pmu_poll_enable
@@ -165,12 +165,12 @@
mkdir /dev/socket/pdx/system/vr/sensors 0775 system system
# Boot time 183626384
- write /proc/vendor_sched/ta_uclamp_min 159
- write /proc/vendor_sched/ta_prefer_idle 1
- write /proc/vendor_sched/fg_uclamp_min 159
- write /proc/vendor_sched/fg_prefer_idle 1
- write /proc/vendor_sched/sys_uclamp_min 159
- write /proc/vendor_sched/sys_prefer_idle 1
+ write /proc/vendor_sched/groups/ta/uclamp_min 159
+ write /proc/vendor_sched/groups/ta/prefer_idle 1
+ write /proc/vendor_sched/groups/fg/uclamp_min 159
+ write /proc/vendor_sched/groups/fg/prefer_idle 1
+ write /proc/vendor_sched/groups/sys/uclamp_min 159
+ write /proc/vendor_sched/groups/sys/prefer_idle 1
# governor setting
write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor sched_pixel
@@ -221,8 +221,8 @@
chown system system /dev/cpuset/camera-daemon-mid-high-group/tasks
chmod 0664 /dev/cpuset/camera-daemon-mid-high-group/tasks
- write /proc/vendor_sched/cam_prefer_idle 1
- write /proc/vendor_sched/cam_uclamp_min 1
+ write /proc/vendor_sched/groups/cam/prefer_idle 1
+ write /proc/vendor_sched/groups/cam/uclamp_min 1
chown system system /dev/cpuset/cgroup.procs
@@ -324,8 +324,8 @@
chown system system /dev/bbd_pwrstat
# Add a boost for NNAPI HAL
- write /proc/vendor_sched/nnapi_prefer_idle 0
- write /proc/vendor_sched/nnapi_uclamp_min 512
+ write /proc/vendor_sched/groups/nnapi/prefer_idle 0
+ write /proc/vendor_sched/groups/nnapi/uclamp_min 512
# Add memlat governor settings
write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu0_memlat@17000010/polling_interval 10
@@ -420,7 +420,7 @@
on zygote-start
# For PixelLogger configuration file.
chmod 0771 /data/vendor/wifi
- write /proc/vendor_sched/sys_uclamp_min 0
+ write /proc/vendor_sched/groups/sys/uclamp_min 0
on post-fs-data
# Create the directories used by the Wireless subsystem
@@ -596,6 +596,7 @@
chown system system /sys/devices/platform/exynos-drm/primary-panel/panel_idle
chown system system /sys/devices/platform/exynos-drm/primary-panel/panel_need_handle_idle_exit
chown system system /sys/module/drm/parameters/vblankoffdelay
+ chown system system /sys/module/drm/parameters/debug
chown system system /sys/class/dqe0/atc/ambient_light
chown system system /sys/class/dqe0/atc/st
chown system system /sys/class/dqe0/atc/en
@@ -729,25 +730,25 @@
setprop vendor.powerhal.init 1
# Setup final cpu.uclamp
- write /proc/vendor_sched/ta_uclamp_min 1
- write /proc/vendor_sched/fg_uclamp_min 0
- write /proc/vendor_sched/sys_prefer_idle 0
+ write /proc/vendor_sched/groups/ta/uclamp_min 1
+ write /proc/vendor_sched/groups/fg/uclamp_min 0
+ write /proc/vendor_sched/groups/sys/prefer_idle 0
# Set ug group
- write /proc/vendor_sched/bg_ug 0
- write /proc/vendor_sched/sysbg_ug 0
- write /proc/vendor_sched/ota_ug 0
- write /proc/vendor_sched/dex2oat_ug 1
- write /proc/vendor_sched/ta_ug 1
+ write /proc/vendor_sched/groups/bg/ug 0
+ write /proc/vendor_sched/groups/sys_bg/ug 0
+ write /proc/vendor_sched/groups/ota/ug 0
+ write /proc/vendor_sched/groups/dex2oat/ug 1
+ write /proc/vendor_sched/groups/ta/ug 1
# Set bg group throttle
write /proc/vendor_sched/ug_bg_group_throttle ${persist.device_config.vendor_system_native.ug_bg_group_throttle:-308}
# Set uclamp.max for some groups, which could indicate cpu importance used in scheduling
- write /proc/vendor_sched/bg_uclamp_max 512
- write /proc/vendor_sched/sysbg_uclamp_max 512
- write /proc/vendor_sched/ota_uclamp_max 512
- write /proc/vendor_sched/dex2oat_uclamp_max 615
+ write /proc/vendor_sched/groups/bg/uclamp_max 512
+ write /proc/vendor_sched/groups/sys_bg/uclamp_max 512
+ write /proc/vendor_sched/groups/ota/uclamp_max 512
+ write /proc/vendor_sched/groups/dex2oat/uclamp_max 615
# Set PMU freq limit parameters
write /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold 2
@@ -933,13 +934,13 @@
on property:vendor.brownout.mitigation.ready=1
# BCL
- write /sys/devices/virtual/pmic/mitigation/clock_ratio/tpu_light_clk_ratio 0xfff041c1 #DFS
- write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu1_heavy_clk_ratio 0xfff041c1 #DFS
- write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu2_heavy_clk_ratio 0xfff041c1 #DFS
- write /sys/devices/virtual/pmic/mitigation/clock_ratio/gpu_light_clk_ratio 0xfff041c1 #DFS
+ write /sys/devices/virtual/pmic/mitigation/clock_ratio/tpu_light_clk_ratio 0x80041c3 #DFS
+ write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu1_heavy_clk_ratio 0xfff041c0 #DFS
+ write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu2_heavy_clk_ratio 0xfff041c0 #DFS
+ write /sys/devices/virtual/pmic/mitigation/clock_ratio/gpu_light_clk_ratio 0x80041c3 #DFS
write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu2_light_clk_ratio 0xfff041c3 #OCP
- write /sys/devices/virtual/pmic/mitigation/clock_ratio/gpu_heavy_clk_ratio 0xfff04385 #OCP
- write /sys/devices/virtual/pmic/mitigation/clock_ratio/tpu_heavy_clk_ratio 0xfff041c3 #OCP
+ write /sys/devices/virtual/pmic/mitigation/clock_ratio/gpu_heavy_clk_ratio 0xfff04381 #OCP
+ write /sys/devices/virtual/pmic/mitigation/clock_ratio/tpu_heavy_clk_ratio 0xfff041c1 #OCP
write /sys/devices/virtual/pmic/mitigation/triggered_lvl/uvlo1_lvl 3200
write /sys/devices/virtual/pmic/mitigation/triggered_lvl/smpl_lvl 3100
write /sys/devices/virtual/pmic/mitigation/triggered_lvl/uvlo2_lvl 3000
@@ -1037,12 +1038,12 @@
# Cancel boot devfreq and uclamp
write /sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/exynos_data/cancel_boot_freq 1
write /sys/devices/platform/17000020.devfreq_int/devfreq/17000020.devfreq_int/exynos_data/cancel_boot_freq 1
- write /proc/vendor_sched/ta_uclamp_min 0
- write /proc/vendor_sched/ta_prefer_idle 0
- write /proc/vendor_sched/fg_uclamp_min 0
- write /proc/vendor_sched/fg_prefer_idle 0
- write /proc/vendor_sched/sys_uclamp_min 0
- write /proc/vendor_sched/sys_prefer_idle 0
+ write /proc/vendor_sched/groups/ta/uclamp_min 0
+ write /proc/vendor_sched/groups/ta/prefer_idle 0
+ write /proc/vendor_sched/groups/fg/uclamp_min 0
+ write /proc/vendor_sched/groups/fg/prefer_idle 0
+ write /proc/vendor_sched/groups/sys/uclamp_min 0
+ write /proc/vendor_sched/groups/sys/prefer_idle 0
# Enable SICD
write /sys/devices/system/cpu/cpupm/cpupm/sicd 1
diff --git a/device-common.mk b/device-common.mk
index bfd64ab..55f5020 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -18,7 +18,6 @@
-include vendor/google_devices/gs201/proprietary/telephony/device-vendor.mk
endif
include device/google/gs201/device.mk
-include device/google/gs101/tts/voice_packs.mk
ifneq ($(BOARD_WITHOUT_RADIO),true)
# Telephony
diff --git a/device.mk b/device.mk
index bb54f1c..fd91d88 100644
--- a/device.mk
+++ b/device.mk
@@ -21,12 +21,13 @@
include device/google/gs-common/soc/freq.mk
include device/google/gs-common/modem/modem.mk
include device/google/gs-common/aoc/aoc.mk
-include device/google/gs-common/thermal/thermal.mk
+include device/google/gs-common/thermal/dump/thermal.mk
+include device/google/gs-common/thermal/thermal_hal/device.mk
include device/google/gs-common/pixel_metrics/pixel_metrics.mk
include device/google/gs-common/performance/perf.mk
include device/google/gs-common/display/dump.mk
include device/google/gs-common/camera/dump.mk
-include device/google/gs-common/gxp/dump.mk
+include device/google/gs-common/gxp/gxp.mk
include device/google/gs-common/gps/dump/log.mk
include device/google/gs-common/radio/dump.mk
include device/google/gs-common/umfw_stat/umfw_stat.mk
@@ -35,6 +36,7 @@
include device/google/gs-common/sota_app/factoryota.mk
include device/google/gs-common/misc_writer/misc_writer.mk
include device/google/gs-common/gyotaku_app/gyotaku.mk
+include device/google/gs-common/bootctrl/bootctrl_aidl.mk
TARGET_BOARD_PLATFORM := gs201
@@ -219,13 +221,18 @@
USE_SWIFTSHADER := false
# HWUI
-TARGET_USES_VULKAN = true
+ifeq ($(USE_SWIFTSHADER),true)
+ TARGET_USES_VULKAN = false
+else
+ TARGET_USES_VULKAN = true
+endif
PRODUCT_SOONG_NAMESPACES += \
vendor/arm/mali/valhall
$(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM))
+include device/google/gs-common/gpu/gpu.mk
PRODUCT_PACKAGES += \
csffw_image_prebuilt__firmware_prebuilt_todx_mali_csffw.bin \
libGLES_mali \
@@ -233,9 +240,6 @@
libOpenCL \
libgpudataproducer \
-PRODUCT_VENDOR_PROPERTIES += \
- ro.hardware.vulkan=mali
-
# Mali Configuration Properties
# b/221255664 prevents setting PROTECTED_MAX_CORE_COUNT=2
PRODUCT_VENDOR_PROPERTIES += \
@@ -245,13 +249,6 @@
vendor.mali.base_protected_tls_max=67108864 \
vendor.mali.platform_agt_frequency_khz=24576
-ifeq ($(USE_SWIFTSHADER),true)
-PRODUCT_PACKAGES += \
- libGLESv1_CM_swiftshader \
- libEGL_swiftshader \
- libGLESv2_swiftshader
-endif
-
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \
frameworks/native/data/etc/android.hardware.vulkan.version-1_3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \
@@ -261,11 +258,19 @@
frameworks/native/data/etc/android.software.opengles.deqp.level-2023-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml
ifeq ($(USE_SWIFTSHADER),true)
+PRODUCT_PACKAGES += \
+ vulkan.pastel
+endif
+
+ifeq ($(USE_SWIFTSHADER),true)
PRODUCT_VENDOR_PROPERTIES += \
- ro.hardware.egl = swiftshader
+ ro.hardware.egl = mali \
+ persist.graphics.egl = angle \
+ ro.hardware.vulkan = pastel
else
PRODUCT_VENDOR_PROPERTIES += \
- ro.hardware.egl = mali
+ ro.hardware.egl = mali \
+ ro.hardware.vulkan = mali
endif
# Configure EGL blobcache
@@ -278,6 +283,9 @@
graphics.gpu.profiler.support=true \
debug.renderengine.backend=skiaglthreaded
+# b/295257834 Add HDR shaders to SurfaceFlinger's pre-warming cache
+PRODUCT_VENDOR_PROPERTIES += ro.surface_flinger.prime_shader_cache.ultrahdr=1
+
# GRAPHICS - GPU (end)
# ####################
@@ -326,7 +334,8 @@
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \
- device/google/gs201/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc
+ device/google/gs201/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc \
+ device/google/gs201/conf/init.check_ap_pd_auth.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.check_ap_pd_auth.sh
endif
# Recovery files
@@ -508,7 +517,7 @@
PRODUCT_PACKAGES += \
android.hardware.graphics.mapper@4.0-impl \
- android.hardware.graphics.allocator-V1-service
+ android.hardware.graphics.allocator-V2-service
PRODUCT_PACKAGES += \
android.hardware.memtrack-service.pixel \
@@ -810,11 +819,12 @@
# Trusty dump
include device/google/gs-common/trusty/trusty.mk
-# Trusty unit test tool
+# Trusty unit test and code coverage tool
PRODUCT_PACKAGES_DEBUG += \
trusty-ut-ctrl \
tipc-test \
trusty_stats_test \
+ trusty-coverage-controller \
include device/google/gs101/confirmationui/confirmationui.mk
@@ -907,19 +917,12 @@
PRODUCT_PACKAGES += ShannonIms
-#RCS Test Messaging App
PRODUCT_PACKAGES_DEBUG += \
- preinstalled-packages-product-gs201-device-debug.xml \
- TestRcsApp
+ preinstalled-packages-product-gs201-device-debug.xml
PRODUCT_PACKAGES += ShannonRcs
endif
-# Boot Control HAL
-PRODUCT_PACKAGES += \
- android.hardware.boot@1.2-impl-gs201 \
- android.hardware.boot@1.2-service-gs201
-
# Exynos RIL and telephony
# Multi SIM(DSDS)
SIM_COUNT := 2
@@ -1000,9 +1003,6 @@
device/google/$(TARGET_BOARD_PLATFORM)/radio/config/Pixel_stability.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/modem/Pixel_stability.cfg \
device/google/$(TARGET_BOARD_PLATFORM)/radio/config/Pixel_stability.nprf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/Pixel_stability.nprf \
-# ARM NN files
-ARMNN_COMPUTE_CL_ENABLE := 1
-
# Vibrator Diag
PRODUCT_PACKAGES_DEBUG += \
diag-vibrator \
@@ -1076,7 +1076,6 @@
# Thermal HAL
PRODUCT_PROPERTY_OVERRIDES += persist.vendor.enable.thermal.genl=true
-include hardware/google/pixel/thermal/device.mk
# EdgeTPU
include device/google/gs-common/edgetpu/edgetpu.mk
@@ -1163,10 +1162,6 @@
# Call deleteAllKeys if vold detects a factory reset
PRODUCT_VENDOR_PROPERTIES += ro.crypto.metadata_init_delete_all_keys.enabled?=true
-# Increase lmkd aggressiveness
-PRODUCT_PROPERTY_OVERRIDES += \
- ro.lmk.swap_free_low_percentage=100
-
# Hardware Info
include hardware/google/pixel/HardwareInfo/HardwareInfo.mk
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 951a125..1e34caf 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -42,7 +42,7 @@
</hal>
<hal format="aidl" optional="true">
<name>com.google.face.debug</name>
- <version>4</version>
+ <version>3-4</version>
<interface>
<name>IDebugHost</name>
<instance>default</instance>
@@ -69,8 +69,16 @@
</interface>
</hal>
<hal format="aidl" optional="true">
+ <name>com.google.edgetpu.tachyon</name>
+ <version>1</version>
+ <interface>
+ <name>IComputeService</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="aidl" optional="true">
<name>com.google.hardware.pixel.display</name>
- <version>9</version>
+ <version>10</version>
<interface>
<name>IDisplay</name>
<instance>default</instance>
@@ -102,7 +110,7 @@
</hal>
<hal format="aidl" optional="true">
<name>vendor.google.google_battery</name>
- <version>2</version>
+ <version>2-3</version>
<interface>
<name>IGoogleBattery</name>
<instance>default</instance>
@@ -118,7 +126,7 @@
</hal>
<hal format="aidl" optional="true">
<name>vendor.google.wifi_ext</name>
- <version>1</version>
+ <version>2-3</version>
<interface>
<name>IWifiExt</name>
<instance>default</instance>
@@ -134,6 +142,13 @@
<instance>sced0</instance>
</interface>
</hal>
+ <hal format="aidl" optional="true">
+ <name>com.google.pixel.modem.logmasklibrary</name>
+ <interface>
+ <name>ILiboemserviceProxy</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
<hal format="hidl" optional="true">
<name>vendor.samsung_slsi.telephony.hardware.radioExternal</name>
<version>1.1</version>
diff --git a/fingerprint/udfps.mk b/fingerprint/udfps.mk
deleted file mode 100644
index 61f138f..0000000
--- a/fingerprint/udfps.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# 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.
-#
-
-PRODUCT_COPY_FILES += \
- frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
-
-# Include the Goodix AIDL HAL namespaces.
-PRODUCT_SOONG_NAMESPACES += vendor/goodix/udfps/g6_trusty
-PRODUCT_SOONG_NAMESPACES += vendor/goodix/udfps/g6_aidl_trusty
-
-$(call soong_config_set,fp_hal_feature,biometric_suez_support,true)
-
-PRODUCT_PACKAGES += \
- android.hardware.biometrics.fingerprint@2.1-service.goodix \
- android.hardware.biometrics.fingerprint-service.goodix
diff --git a/fingerprint/udfps_factory.mk b/fingerprint/udfps_factory.mk
deleted file mode 100644
index 41aebe0..0000000
--- a/fingerprint/udfps_factory.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# 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.
-#
-
-PRODUCT_PACKAGES += \
- GF_delmar_factory \
- udfps_test
-
-PRODUCT_PROPERTY_OVERRIDES += \
- gf.debug.dump_data=1
diff --git a/interfaces/boot/1.0/Android.bp b/interfaces/boot/1.0/Android.bp
deleted file mode 100644
index a5937e7..0000000
--- a/interfaces/boot/1.0/Android.bp
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (C) 2019 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.
-
-package {
- // See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "//device/google/gs201:device_google_gs201_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- default_applicable_licenses: [
- "//device/google/gs201:device_google_gs201_license",
- ],
-}
-
-cc_binary {
- name: "android.hardware.boot@1.0-service-gs201",
- defaults: ["hidl_defaults"],
- relative_install_path: "hw",
- vendor: true,
- init_rc: ["android.hardware.boot@1.0-service-gs201.rc"],
- srcs: [
- "BootControl.cpp",
- "GptUtils.cpp",
- "service.cpp"
- ],
- shared_libs: [
- "libbase",
- "liblog",
- "libhidlbase",
- "libutils",
- "libcutils",
- "libz",
- "android.hardware.boot@1.0",
- ],
-}
-
-cc_library {
- name: "android.hardware.boot@1.0-impl-gs201",
- recovery: true,
- srcs: [
- "BootControl.cpp",
- "GptUtils.cpp",
- ],
- relative_install_path: "hw",
- shared_libs: [
- "libbase",
- "liblog",
- "libhidlbase",
- "libutils",
- "libcutils",
- "libz",
- "android.hardware.boot@1.0",
- ],
-}
diff --git a/interfaces/boot/1.0/BootControl.cpp b/interfaces/boot/1.0/BootControl.cpp
deleted file mode 100644
index 1f155c9..0000000
--- a/interfaces/boot/1.0/BootControl.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-#define LOG_TAG "bootcontrolhal"
-
-#include "BootControl.h"
-#include "GptUtils.h"
-
-#include <android-base/file.h>
-#include <cutils/properties.h>
-#include <log/log.h>
-
-namespace android {
-namespace hardware {
-namespace boot {
-namespace V1_0 {
-namespace implementation {
-
-namespace {
-
-#define BOOT_A_PATH "/dev/block/by-name/boot_a"
-#define BOOT_B_PATH "/dev/block/by-name/boot_b"
-
-// slot flags
-#define AB_ATTR_PRIORITY_SHIFT 52
-#define AB_ATTR_PRIORITY_MASK (3UL << AB_ATTR_PRIORITY_SHIFT)
-#define AB_ATTR_ACTIVE_SHIFT 54
-#define AB_ATTR_ACTIVE (1UL << AB_ATTR_ACTIVE_SHIFT)
-#define AB_ATTR_RETRY_COUNT_SHIFT (55)
-#define AB_ATTR_RETRY_COUNT_MASK (7UL << AB_ATTR_RETRY_COUNT_SHIFT)
-#define AB_ATTR_SUCCESSFUL (1UL << 58)
-#define AB_ATTR_UNBOOTABLE (1UL << 59)
-
-#define AB_ATTR_MAX_PRIORITY 3UL
-#define AB_ATTR_MAX_RETRY_COUNT 3UL
-
-static std::string getDevPath(uint32_t slot) {
- char real_path[PATH_MAX];
-
- const char *path = slot == 0 ? BOOT_A_PATH : BOOT_B_PATH;
-
- int ret = readlink(path, real_path, sizeof real_path);
- if (ret < 0) {
- ALOGE("readlink failed for boot device %s\n", strerror(errno));
- return std::string();
- }
-
- std::string dp(real_path);
- // extract /dev/sda.. part
- return dp.substr(0, sizeof "/dev/block/sdX" - 1);
-}
-
-static bool isSlotFlagSet(uint32_t slot, uint64_t flag) {
- std::string dev_path = getDevPath(slot);
- if (dev_path.empty()) {
- ALOGI("Could not get device path for slot %d\n", slot);
- return false;
- }
-
- GptUtils gpt(dev_path);
- if (gpt.Load()) {
- ALOGI("failed to load gpt data\n");
- return false;
- }
-
- gpt_entry *e = gpt.GetPartitionEntry(slot ? "boot_b" : "boot_a");
- if (e == nullptr) {
- ALOGI("failed to get gpt entry\n");
- return false;
- }
-
- return !!(e->attr & flag);
-}
-
-static int setSlotFlag(uint32_t slot, uint64_t flag) {
- std::string dev_path = getDevPath(slot);
- if (dev_path.empty()) {
- ALOGI("Could not get device path for slot %d\n", slot);
- return -1;
- }
-
- GptUtils gpt(dev_path);
- if (gpt.Load()) {
- ALOGI("failed to load gpt data\n");
- return -1;
- }
-
- gpt_entry *e = gpt.GetPartitionEntry(slot ? "boot_b" : "boot_a");
- if (e == nullptr) {
- ALOGI("failed to get gpt entry\n");
- return -1;
- }
-
- e->attr |= flag;
- gpt.Sync();
-
- return 0;
-}
-
-}
-
-// Methods from ::android::hardware::boot::V1_0::IBootControl follow.
-Return<uint32_t> BootControl::getNumberSlots() {
- uint32_t slots = 0;
-
- if (access(BOOT_A_PATH, F_OK) == 0)
- slots++;
-
- if (access(BOOT_B_PATH, F_OK) == 0)
- slots++;
-
- return slots;
-}
-
-Return<uint32_t> BootControl::getCurrentSlot() {
- char suffix[PROPERTY_VALUE_MAX];
- property_get("ro.boot.slot_suffix", suffix, "_a");
- return std::string(suffix) == "_b" ? 1 : 0;
-}
-
-Return<void> BootControl::markBootSuccessful(markBootSuccessful_cb _hidl_cb) {
- if (getNumberSlots() == 0) {
- // no slots, just return true otherwise Android keeps trying
- _hidl_cb({true, ""});
- return Void();
- }
- int ret = setSlotFlag(getCurrentSlot(), AB_ATTR_SUCCESSFUL);
- ret ? _hidl_cb({false, "Failed to set successfull flag"}) : _hidl_cb({true, ""});
- return Void();
-}
-
-Return<void> BootControl::setActiveBootSlot(uint32_t slot, setActiveBootSlot_cb _hidl_cb) {
- if (slot >= 2) {
- _hidl_cb({false, "Invalid slot"});
- return Void();
- }
-
- std::string dev_path = getDevPath(slot);
- if (dev_path.empty()) {
- _hidl_cb({false, "Could not get device path for slot"});
- return Void();
- }
-
- GptUtils gpt(dev_path);
- if (gpt.Load()) {
- _hidl_cb({false, "failed to load gpt data"});
- return Void();
- }
-
- gpt_entry *active_entry = gpt.GetPartitionEntry(slot == 0 ? "boot_a" : "boot_b");
- gpt_entry *inactive_entry = gpt.GetPartitionEntry(slot == 0 ? "boot_b" : "boot_a");
- if (active_entry == nullptr || inactive_entry == nullptr) {
- _hidl_cb({false, "failed to get entries for boot partitions"});
- return Void();
- }
-
- ALOGV("slot active attributes %lx\n", active_entry->attr);
- ALOGV("slot inactive attributes %lx\n", inactive_entry->attr);
-
- char boot_dev[PROPERTY_VALUE_MAX];
- property_get("ro.boot.bootdevice", boot_dev, "");
- if (boot_dev[0] == '\0') {
- _hidl_cb({false, "invalid ro.boot.bootdevice prop"});
- return Void();
- }
-
- std::string boot_lun_path = std::string("/sys/devices/platform/") +
- boot_dev + "/pixel/boot_lun_enabled";
- int fd = open(boot_lun_path.c_str(), O_RDWR);
- if (fd < 0) {
- // Try old path for kernels < 5.4
- // TODO: remove once kernel 4.19 support is deprecated
- std::string boot_lun_path = std::string("/sys/devices/platform/") +
- boot_dev + "/attributes/boot_lun_enabled";
- fd = open(boot_lun_path.c_str(), O_RDWR);
- if (fd < 0) {
- _hidl_cb({false, "failed to open ufs attr boot_lun_enabled"});
- return Void();
- }
- }
-
- // update attributes for active and inactive
- inactive_entry->attr &= ~AB_ATTR_ACTIVE;
- active_entry->attr = AB_ATTR_ACTIVE | (AB_ATTR_MAX_PRIORITY << AB_ATTR_PRIORITY_SHIFT) |
- (AB_ATTR_MAX_RETRY_COUNT << AB_ATTR_RETRY_COUNT_SHIFT);
-
- //
- // bBootLunEn
- // 0x1 => Boot LU A = enabled, Boot LU B = disable
- // 0x2 => Boot LU A = disable, Boot LU B = enabled
- //
- int ret = android::base::WriteStringToFd(slot == 0 ? "1" : "2", fd);
- close(fd);
- if (ret < 0) {
- _hidl_cb({false, "faied to write boot_lun_enabled attribute"});
- return Void();
- }
-
- _hidl_cb({true, ""});
- return Void();
-}
-
-Return<void> BootControl::setSlotAsUnbootable(uint32_t slot, setSlotAsUnbootable_cb _hidl_cb) {
- if (slot >= 2) {
- _hidl_cb({false, "Invalid slot"});
- return Void();
- }
-
- std::string dev_path = getDevPath(slot);
- if (dev_path.empty()) {
- _hidl_cb({false, "Could not get device path for slot"});
- return Void();
- }
-
- GptUtils gpt(dev_path);
- gpt.Load();
-
- gpt_entry *e = gpt.GetPartitionEntry(slot ? "boot_b" : "boot_a");
- e->attr |= AB_ATTR_UNBOOTABLE;
-
- gpt.Sync();
-
- _hidl_cb({true, ""});
- return Void();
-}
-
-Return<::android::hardware::boot::V1_0::BoolResult> BootControl::isSlotBootable(uint32_t slot) {
- if (getNumberSlots() == 0)
- return BoolResult::FALSE;
- if (slot >= getNumberSlots())
- return BoolResult::INVALID_SLOT;
- return isSlotFlagSet(slot, AB_ATTR_UNBOOTABLE) ? BoolResult::FALSE : BoolResult::TRUE;
-}
-
-Return<::android::hardware::boot::V1_0::BoolResult> BootControl::isSlotMarkedSuccessful(uint32_t slot) {
- if (getNumberSlots() == 0) {
- // just return true so that we don't we another call trying to mark it as successful
- // when there is no slots
- return BoolResult::TRUE;
- }
- if (slot >= getNumberSlots())
- return BoolResult::INVALID_SLOT;
- return isSlotFlagSet(slot, AB_ATTR_SUCCESSFUL) ? BoolResult::TRUE : BoolResult::FALSE;
-}
-
-Return<void> BootControl::getSuffix(uint32_t slot, getSuffix_cb _hidl_cb) {
- _hidl_cb(slot == 0 ? "_a" : slot == 1 ? "_b" : "");
- return Void();
-}
-
-extern "C" IBootControl* HIDL_FETCH_IBootControl(const char*) {
- return new BootControl();
-}
-
-} // namespace implementation
-} // namespace V1_0
-} // namespace boot
-} // namespace hardware
-} // namespace android
diff --git a/interfaces/boot/1.0/BootControl.h b/interfaces/boot/1.0/BootControl.h
deleted file mode 100644
index eb81cb0..0000000
--- a/interfaces/boot/1.0/BootControl.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-#pragma once
-
-#include <android/hardware/boot/1.0/IBootControl.h>
-#include <hidl/MQDescriptor.h>
-#include <hidl/Status.h>
-
-namespace android {
-namespace hardware {
-namespace boot {
-namespace V1_0 {
-namespace implementation {
-
-using ::android::hardware::hidl_array;
-using ::android::hardware::hidl_memory;
-using ::android::hardware::hidl_string;
-using ::android::hardware::hidl_vec;
-using ::android::hardware::Return;
-using ::android::hardware::Void;
-using ::android::sp;
-
-struct BootControl : public IBootControl {
- // Methods from ::android::hardware::boot::V1_0::IBootControl follow.
- Return<uint32_t> getNumberSlots() override;
- Return<uint32_t> getCurrentSlot() override;
- Return<void> markBootSuccessful(markBootSuccessful_cb _hidl_cb) override;
- Return<void> setActiveBootSlot(uint32_t slot, setActiveBootSlot_cb _hidl_cb) override;
- Return<void> setSlotAsUnbootable(uint32_t slot, setSlotAsUnbootable_cb _hidl_cb) override;
- Return<::android::hardware::boot::V1_0::BoolResult> isSlotBootable(uint32_t slot) override;
- Return<::android::hardware::boot::V1_0::BoolResult> isSlotMarkedSuccessful(uint32_t slot) override;
- Return<void> getSuffix(uint32_t slot, getSuffix_cb _hidl_cb) override;
-
- // Methods from ::android::hidl::base::V1_0::IBase follow.
-
-};
-
-// FIXME: most likely delete, this is only for passthrough implementations
-extern "C" IBootControl* HIDL_FETCH_IBootControl(const char* name);
-
-} // namespace implementation
-} // namespace V1_0
-} // namespace boot
-} // namespace hardware
-} // namespace android
diff --git a/interfaces/boot/1.0/GptUtils.cpp b/interfaces/boot/1.0/GptUtils.cpp
deleted file mode 100644
index f893617..0000000
--- a/interfaces/boot/1.0/GptUtils.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-#define LOG_TAG "bootcontrolhal"
-
-#include "GptUtils.h"
-
-#include <errno.h>
-#include <log/log.h>
-#include <android-base/file.h>
-#include <linux/fs.h>
-#include <zlib.h>
-
-namespace android {
-namespace hardware {
-namespace boot {
-namespace V1_0 {
-namespace implementation {
-
-namespace {
-
-static int ValidateGptHeader(gpt_header *gpt)
-{
- if (gpt->signature != GPT_SIGNATURE) {
- ALOGE("invalid gpt signature 0x%lx\n", gpt->signature);
- return -1;
- }
-
- if (gpt->header_size != sizeof(gpt_header)) {
- ALOGE("invalid gpt header size %u\n", gpt->header_size);
- return -1;
- }
-
- if (gpt->entry_size != sizeof(gpt_entry)) {
- ALOGE("invalid gpt entry size %u\n", gpt->entry_size);
- return -1;
- }
-
- return 0;
-}
-
-}
-
-GptUtils::GptUtils(const std::string dev_path) : dev_path(dev_path), fd(0) {}
-
-int GptUtils::Load(void)
-{
- fd = open(dev_path.c_str(), O_RDWR);
- if (fd < 0) {
- ALOGE("failed to open block dev %s, %d\n", dev_path.c_str(), errno);
- return -1;
- }
-
- int ret = ioctl(fd, BLKSSZGET, &block_size);
- if (ret < 0) {
- ALOGE("failed to get block size %d\n", errno);
- return -1;
- }
-
- // read primary header
- lseek64(fd, block_size, SEEK_SET);
- ret = read(fd, &gpt_primary, sizeof gpt_primary);
- if (ret < 0) {
- ALOGE("failed to read gpt primary header %d\n", errno);
- return -1;
- }
-
- if (ValidateGptHeader(&gpt_primary)) {
- ALOGE("error validating gpt header\n");
- return -1;
- }
-
- // read partition entries
- entry_array.resize(gpt_primary.entry_count);
- uint32_t entries_size = gpt_primary.entry_size * gpt_primary.entry_count;
- lseek64(fd, block_size * gpt_primary.start_lba, SEEK_SET);
- ret = read(fd, entry_array.data(), entries_size);
- if (ret < 0) {
- ALOGE("failed to read gpt partition entries %d\n", errno);
- return -1;
- }
-
- // read gpt back header
- lseek64(fd, block_size * gpt_primary.backup_lba, SEEK_SET);
- ret = read(fd, &gpt_backup, sizeof gpt_backup);
- if (ret < 0) {
- ALOGE("failed to read gpt backup header %d\n", errno);
- return -1;
- }
-
- if (ValidateGptHeader(&gpt_backup)) {
- ALOGW("error validating gpt backup\n"); // just warn about it, not fail
- }
-
- // Create map <partition name, gpt_entry pointer>
- auto get_name = [](const uint16_t *efi_name) {
- char name[37] = {};
- for (int i = 0; efi_name[i] && i < sizeof name - 1; ++i)
- name[i] = efi_name[i];
- return std::string(name);
- };
-
- for (auto const &e: entry_array) {
- if (e.name[0] == 0)
- break; // stop at the first partition with no name
- std::string s = get_name(e.name);
- entries[s] = const_cast<gpt_entry *>(&e);
- }
-
- return 0;
-}
-
-gpt_entry *GptUtils::GetPartitionEntry(std::string name)
-{
- return entries.find(name) != entries.end() ? entries[name] : nullptr;
-}
-
-int GptUtils::Sync(void)
-{
- if (!fd)
- return -1;
-
- // calculate crc and check if we need to update gpt
- gpt_primary.entries_crc32 = crc32(0, reinterpret_cast<uint8_t *>(entry_array.data()),
- entry_array.size() * sizeof(gpt_entry));
-
- // save old crc
- uint32_t crc = gpt_primary.crc32;
- gpt_primary.crc32 = 0;
-
- gpt_primary.crc32 = crc32(0, reinterpret_cast<uint8_t *>(&gpt_primary), sizeof gpt_primary);
- if (crc == gpt_primary.crc32)
- return 0; // nothing to do (no changes)
-
- ALOGI("updating GPT\n");
-
- lseek64(fd, block_size * gpt_primary.current_lba, SEEK_SET);
- int ret = write(fd, &gpt_primary, sizeof gpt_primary);
- if (ret < 0) {
- ALOGE("failed to write gpt primary header %d\n", errno);
- return -1;
- }
-
- lseek64(fd, block_size * gpt_primary.start_lba, SEEK_SET);
- ret = write(fd, entry_array.data(), entry_array.size() * sizeof(gpt_entry));
- if (ret < 0) {
- ALOGE("failed to write gpt partition entries %d\n", errno);
- return -1;
- }
-
- //update GPT backup entries and backup
- lseek64(fd, block_size * gpt_backup.start_lba, SEEK_SET);
- ret = write(fd, entry_array.data(), entry_array.size() * sizeof(gpt_entry));
- if (ret < 0) {
- ALOGE("failed to write gpt backup partition entries %d\n", errno);
- return -1;
- }
-
- gpt_backup.entries_crc32 = gpt_primary.entries_crc32;
- gpt_backup.crc32 = 0;
- gpt_backup.crc32 = crc32(0, reinterpret_cast<uint8_t *>(&gpt_backup), sizeof gpt_backup);
- lseek64(fd, block_size * gpt_primary.backup_lba, SEEK_SET);
- ret = write(fd, &gpt_backup, sizeof gpt_backup);
- if (ret < 0) {
- ALOGE("failed to write gpt backup header %d\n", errno);
- return -1;
- }
-
- fsync(fd);
-
- return 0;
-}
-
-GptUtils::~GptUtils()
-{
- if (fd) {
- Sync();
- close(fd);
- }
-}
-
-} // namespace implementation
-} // namespace V1_0
-} // namespace boot
-} // namespace hardware
-} // namespace android
diff --git a/interfaces/boot/1.0/GptUtils.h b/interfaces/boot/1.0/GptUtils.h
deleted file mode 100644
index d969d9d..0000000
--- a/interfaces/boot/1.0/GptUtils.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-#pragma once
-
-#include <string>
-#include <vector>
-#include <map>
-
-namespace android {
-namespace hardware {
-namespace boot {
-namespace V1_0 {
-namespace implementation {
-
-#define GPT_SIGNATURE 0x5452415020494645UL
-
-typedef struct {
- uint8_t type_guid[16];
- uint8_t guid[16];
- uint64_t first_lba;
- uint64_t last_lba;
- uint64_t attr;
- uint16_t name[36];
-} __attribute__((packed)) gpt_entry;
-
-typedef struct {
- uint64_t signature;
- uint32_t revision;
- uint32_t header_size;
- uint32_t crc32;
- uint32_t reserved;
- uint64_t current_lba;
- uint64_t backup_lba;
- uint64_t first_usable_lba;
- uint64_t last_usable_lba;
- uint8_t disk_guid[16];
- uint64_t start_lba;
- uint32_t entry_count;
- uint32_t entry_size;
- uint32_t entries_crc32;
-} __attribute__((packed)) gpt_header;
-
-class GptUtils {
- public:
- GptUtils(const std::string dev_path);
- int Load(void);
- gpt_entry *GetPartitionEntry(std::string name);
- int Sync(void);
- ~GptUtils();
-
- private:
- std::string dev_path;
- int fd;
- uint32_t block_size;
- gpt_header gpt_primary;
- gpt_header gpt_backup;
- std::vector<gpt_entry> entry_array;
- std::map<std::string, gpt_entry *>entries;
-};
-
-} // namespace implementation
-} // namespace V1_0
-} // namespace boot
-} // namespace hardware
-} // namespace android
diff --git a/interfaces/boot/1.0/android.hardware.boot@1.0-service-gs201.rc b/interfaces/boot/1.0/android.hardware.boot@1.0-service-gs201.rc
deleted file mode 100644
index 7a7849f..0000000
--- a/interfaces/boot/1.0/android.hardware.boot@1.0-service-gs201.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-service vendor.boot-hal-1-0 /vendor/bin/hw/android.hardware.boot@1.0-service-gs201
- class early_hal
- user root
- group root
diff --git a/interfaces/boot/1.0/service.cpp b/interfaces/boot/1.0/service.cpp
deleted file mode 100644
index 9dcd78c..0000000
--- a/interfaces/boot/1.0/service.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2016 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.
- */
-#define LOG_TAG "android.hardware.boot@1.0-service"
-
-#include <log/log.h>
-#include <hidl/HidlTransportSupport.h>
-#include <hidl/Status.h>
-#include <android/hardware/boot/1.0/IBootControl.h>
-#include "BootControl.h"
-
-using ::android::status_t;
-
-using ::android::hardware::boot::V1_0::IBootControl;
-
-using ::android::hardware::boot::V1_0::implementation::BootControl;
-
-int main (int /* argc */, char * /* argv */ []) {
- // This function must be called before you join to ensure the proper
- // number of threads are created. The threadpool will never exceed
- // size one because of this call.
- ::android::hardware::configureRpcThreadpool(1 /*threads*/, true /*willJoin*/);
-
- ::android::sp bootctrl = new BootControl();
- const status_t status = bootctrl->registerAsService();
- if (status != ::android::OK) {
- return 1; // or handle error
- }
-
- // Adds this thread to the threadpool, resulting in one total
- // thread in the threadpool. We could also do other things, but
- // would have to specify 'false' to willJoin in configureRpcThreadpool.
- ::android::hardware::joinRpcThreadpool();
- return 1; // joinRpcThreadpool should never return
-}
diff --git a/interfaces/boot/1.2/Android.bp b/interfaces/boot/1.2/Android.bp
deleted file mode 100644
index a9fb7f4..0000000
--- a/interfaces/boot/1.2/Android.bp
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// 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.
-
-package {
- // See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "//device/google/gs201:device_google_gs201_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- default_applicable_licenses: [
- "//device/google/gs201:device_google_gs201_license",
- ],
-}
-
-cc_binary {
- name: "android.hardware.boot@1.2-service-gs201",
- defaults: ["hidl_defaults"],
- relative_install_path: "hw",
- vendor: true,
- init_rc: ["android.hardware.boot@1.2-service-gs201.rc"],
- srcs: [
- "BootControl.cpp",
- "GptUtils.cpp",
- "service.cpp"
- ],
- shared_libs: [
- "libbase",
- "liblog",
- "libhidlbase",
- "libutils",
- "libcutils",
- "libz",
- "android.hardware.boot@1.0",
- "android.hardware.boot@1.1",
- "android.hardware.boot@1.2",
- ],
- static_libs: [
- "libboot_control",
- "libbootloader_message_vendor",
- "libfstab",
- ],
-}
-
-cc_library {
- name: "android.hardware.boot@1.2-impl-gs201",
- stem: "android.hardware.boot@1.0-impl-1.2-impl-gs201",
- recovery: true,
- srcs: [
- "BootControl.cpp",
- "GptUtils.cpp",
- ],
- relative_install_path: "hw",
- shared_libs: [
- "libbase",
- "liblog",
- "libhidlbase",
- "libutils",
- "libcutils",
- "libz",
- "android.hardware.boot@1.0",
- "android.hardware.boot@1.1",
- "android.hardware.boot@1.2",
- ],
- static_libs: [
- "libboot_control",
- "libbootloader_message_vendor",
- "libfstab",
- ],
-}
diff --git a/interfaces/boot/1.2/BootControl.cpp b/interfaces/boot/1.2/BootControl.cpp
deleted file mode 100644
index a28be05..0000000
--- a/interfaces/boot/1.2/BootControl.cpp
+++ /dev/null
@@ -1,420 +0,0 @@
-/*
- * 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.
- */
-
-#define LOG_TAG "bootcontrolhal"
-
-#include "BootControl.h"
-
-#include <android-base/file.h>
-#include <android-base/unique_fd.h>
-#include <bootloader_message/bootloader_message.h>
-#include <cutils/properties.h>
-#include <libboot_control/libboot_control.h>
-#include <log/log.h>
-
-#include "DevInfo.h"
-#include "GptUtils.h"
-
-namespace android {
-namespace hardware {
-namespace boot {
-namespace V1_2 {
-namespace implementation {
-
-using android::bootable::GetMiscVirtualAbMergeStatus;
-using android::bootable::InitMiscVirtualAbMessageIfNeeded;
-using android::bootable::SetMiscVirtualAbMergeStatus;
-using android::hardware::boot::V1_0::BoolResult;
-using android::hardware::boot::V1_0::CommandResult;
-using android::hardware::boot::V1_1::MergeStatus;
-
-namespace {
-
-// clang-format off
-
-#define BOOT_A_PATH "/dev/block/by-name/boot_a"
-#define BOOT_B_PATH "/dev/block/by-name/boot_b"
-#define DEVINFO_PATH "/dev/block/by-name/devinfo"
-
-// slot flags
-#define AB_ATTR_PRIORITY_SHIFT 52
-#define AB_ATTR_PRIORITY_MASK (3UL << AB_ATTR_PRIORITY_SHIFT)
-#define AB_ATTR_ACTIVE_SHIFT 54
-#define AB_ATTR_ACTIVE (1UL << AB_ATTR_ACTIVE_SHIFT)
-#define AB_ATTR_RETRY_COUNT_SHIFT (55)
-#define AB_ATTR_RETRY_COUNT_MASK (7UL << AB_ATTR_RETRY_COUNT_SHIFT)
-#define AB_ATTR_SUCCESSFUL (1UL << 58)
-#define AB_ATTR_UNBOOTABLE (1UL << 59)
-
-#define AB_ATTR_MAX_PRIORITY 3UL
-#define AB_ATTR_MAX_RETRY_COUNT 3UL
-
-// clang-format on
-
-static std::string getDevPath(uint32_t slot) {
- char real_path[PATH_MAX];
-
- const char *path = slot == 0 ? BOOT_A_PATH : BOOT_B_PATH;
-
- int ret = readlink(path, real_path, sizeof real_path);
- if (ret < 0) {
- ALOGE("readlink failed for boot device %s\n", strerror(errno));
- return std::string();
- }
-
- std::string dp(real_path);
- // extract /dev/sda.. part
- return dp.substr(0, sizeof "/dev/block/sdX" - 1);
-}
-
-static bool isSlotFlagSet(uint32_t slot, uint64_t flag) {
- std::string dev_path = getDevPath(slot);
- if (dev_path.empty()) {
- ALOGI("Could not get device path for slot %d\n", slot);
- return false;
- }
-
- GptUtils gpt(dev_path);
- if (gpt.Load()) {
- ALOGI("failed to load gpt data\n");
- return false;
- }
-
- gpt_entry *e = gpt.GetPartitionEntry(slot ? "boot_b" : "boot_a");
- if (e == nullptr) {
- ALOGI("failed to get gpt entry\n");
- return false;
- }
-
- return !!(e->attr & flag);
-}
-
-static bool setSlotFlag(uint32_t slot, uint64_t flag) {
- std::string dev_path = getDevPath(slot);
- if (dev_path.empty()) {
- ALOGI("Could not get device path for slot %d\n", slot);
- return false;
- }
-
- GptUtils gpt(dev_path);
- if (gpt.Load()) {
- ALOGI("failed to load gpt data\n");
- return false;
- }
-
- gpt_entry *e = gpt.GetPartitionEntry(slot ? "boot_b" : "boot_a");
- if (e == nullptr) {
- ALOGI("failed to get gpt entry\n");
- return false;
- }
-
- e->attr |= flag;
- gpt.Sync();
-
- return true;
-}
-
-static bool is_devinfo_valid;
-static bool is_devinfo_initialized;
-static std::mutex devinfo_lock;
-static devinfo_t devinfo;
-
-static bool isDevInfoValid() {
- const std::lock_guard<std::mutex> lock(devinfo_lock);
-
- if (is_devinfo_initialized) {
- return is_devinfo_valid;
- }
-
- is_devinfo_initialized = true;
-
- android::base::unique_fd fd(open(DEVINFO_PATH, O_RDONLY));
- android::base::ReadFully(fd, &devinfo, sizeof devinfo);
-
- if (devinfo.magic != DEVINFO_MAGIC) {
- return is_devinfo_valid;
- }
-
- uint32_t version = ((uint32_t)devinfo.ver_major << 16) | devinfo.ver_minor;
- // only version 3.3+ supports A/B data
- if (version >= 0x0003'0003) {
- is_devinfo_valid = true;
- }
-
- return is_devinfo_valid;
-}
-
-static bool DevInfoSync() {
- if (!isDevInfoValid()) {
- return false;
- }
-
- android::base::unique_fd fd(open(DEVINFO_PATH, O_WRONLY | O_DSYNC));
- return android::base::WriteFully(fd, &devinfo, sizeof devinfo);
-}
-
-static void DevInfoInitSlot(devinfo_ab_slot_data_t &slot_data) {
- slot_data.retry_count = AB_ATTR_MAX_RETRY_COUNT;
- slot_data.unbootable = 0;
- slot_data.successful = 0;
- slot_data.active = 1;
- slot_data.fastboot_ok = 0;
-}
-
-} // namespace
-
-// Methods from ::android::hardware::boot::V1_0::IBootControl follow.
-Return<uint32_t> BootControl::getNumberSlots() {
- uint32_t slots = 0;
-
- if (access(BOOT_A_PATH, F_OK) == 0)
- slots++;
-
- if (access(BOOT_B_PATH, F_OK) == 0)
- slots++;
-
- return slots;
-}
-
-Return<uint32_t> BootControl::getCurrentSlot() {
- char suffix[PROPERTY_VALUE_MAX];
- property_get("ro.boot.slot_suffix", suffix, "_a");
- return std::string(suffix) == "_b" ? 1 : 0;
-}
-
-Return<void> BootControl::markBootSuccessful(markBootSuccessful_cb _hidl_cb) {
- if (getNumberSlots() == 0) {
- // no slots, just return true otherwise Android keeps trying
- _hidl_cb({true, ""});
- return Void();
- }
-
- bool ret;
- if (isDevInfoValid()) {
- auto const slot = getCurrentSlot();
- devinfo.ab_data.slots[slot].successful = 1;
- ret = DevInfoSync();
- } else {
- ret = setSlotFlag(getCurrentSlot(), AB_ATTR_SUCCESSFUL);
- }
-
- !ret ? _hidl_cb({false, "Failed to set successful flag"}) : _hidl_cb({true, ""});
- return Void();
-}
-
-Return<void> BootControl::setActiveBootSlot(uint32_t slot, setActiveBootSlot_cb _hidl_cb) {
- if (slot >= 2) {
- _hidl_cb({false, "Invalid slot"});
- return Void();
- }
-
- if (isDevInfoValid()) {
- auto &active_slot_data = devinfo.ab_data.slots[slot];
- auto &inactive_slot_data = devinfo.ab_data.slots[!slot];
-
- inactive_slot_data.active = 0;
- DevInfoInitSlot(active_slot_data);
-
- if (!DevInfoSync()) {
- _hidl_cb({false, "Could not update DevInfo data"});
- return Void();
- }
- } else {
- std::string dev_path = getDevPath(slot);
- if (dev_path.empty()) {
- _hidl_cb({false, "Could not get device path for slot"});
- return Void();
- }
-
- GptUtils gpt(dev_path);
- if (gpt.Load()) {
- _hidl_cb({false, "failed to load gpt data"});
- return Void();
- }
-
- gpt_entry *active_entry = gpt.GetPartitionEntry(slot == 0 ? "boot_a" : "boot_b");
- gpt_entry *inactive_entry = gpt.GetPartitionEntry(slot == 0 ? "boot_b" : "boot_a");
- if (active_entry == nullptr || inactive_entry == nullptr) {
- _hidl_cb({false, "failed to get entries for boot partitions"});
- return Void();
- }
-
- ALOGV("slot active attributes %lx\n", active_entry->attr);
- ALOGV("slot inactive attributes %lx\n", inactive_entry->attr);
-
- // update attributes for active and inactive
- inactive_entry->attr &= ~AB_ATTR_ACTIVE;
- active_entry->attr = AB_ATTR_ACTIVE | (AB_ATTR_MAX_PRIORITY << AB_ATTR_PRIORITY_SHIFT) |
- (AB_ATTR_MAX_RETRY_COUNT << AB_ATTR_RETRY_COUNT_SHIFT);
- }
-
- char boot_dev[PROPERTY_VALUE_MAX];
- property_get("ro.boot.bootdevice", boot_dev, "");
- if (boot_dev[0] == '\0') {
- _hidl_cb({false, "invalid ro.boot.bootdevice prop"});
- return Void();
- }
-
- std::string boot_lun_path =
- std::string("/sys/devices/platform/") + boot_dev + "/pixel/boot_lun_enabled";
- int fd = open(boot_lun_path.c_str(), O_RDWR | O_DSYNC);
- if (fd < 0) {
- // Try old path for kernels < 5.4
- // TODO: remove once kernel 4.19 support is deprecated
- std::string boot_lun_path =
- std::string("/sys/devices/platform/") + boot_dev + "/attributes/boot_lun_enabled";
- fd = open(boot_lun_path.c_str(), O_RDWR | O_DSYNC);
- if (fd < 0) {
- _hidl_cb({false, "failed to open ufs attr boot_lun_enabled"});
- return Void();
- }
- }
-
- //
- // bBootLunEn
- // 0x1 => Boot LU A = enabled, Boot LU B = disable
- // 0x2 => Boot LU A = disable, Boot LU B = enabled
- //
- int ret = android::base::WriteStringToFd(slot == 0 ? "1" : "2", fd);
- close(fd);
- if (ret < 0) {
- _hidl_cb({false, "faied to write boot_lun_enabled attribute"});
- return Void();
- }
-
- _hidl_cb({true, ""});
- return Void();
-}
-
-Return<void> BootControl::setSlotAsUnbootable(uint32_t slot, setSlotAsUnbootable_cb _hidl_cb) {
- if (slot >= 2) {
- _hidl_cb({false, "Invalid slot"});
- return Void();
- }
-
- if (isDevInfoValid()) {
- auto &slot_data = devinfo.ab_data.slots[slot];
- slot_data.unbootable = 1;
- if (!DevInfoSync()) {
- _hidl_cb({false, "Could not update DevInfo data"});
- return Void();
- }
- } else {
- std::string dev_path = getDevPath(slot);
- if (dev_path.empty()) {
- _hidl_cb({false, "Could not get device path for slot"});
- return Void();
- }
-
- GptUtils gpt(dev_path);
- gpt.Load();
-
- gpt_entry *e = gpt.GetPartitionEntry(slot ? "boot_b" : "boot_a");
- e->attr |= AB_ATTR_UNBOOTABLE;
-
- gpt.Sync();
- }
-
- _hidl_cb({true, ""});
- return Void();
-}
-
-Return<::android::hardware::boot::V1_0::BoolResult> BootControl::isSlotBootable(uint32_t slot) {
- if (getNumberSlots() == 0)
- return BoolResult::FALSE;
- if (slot >= getNumberSlots())
- return BoolResult::INVALID_SLOT;
-
- bool unbootable;
- if (isDevInfoValid()) {
- auto &slot_data = devinfo.ab_data.slots[slot];
- unbootable = !!slot_data.unbootable;
- } else {
- unbootable = isSlotFlagSet(slot, AB_ATTR_UNBOOTABLE);
- }
-
- return unbootable ? BoolResult::FALSE : BoolResult::TRUE;
-}
-
-Return<::android::hardware::boot::V1_0::BoolResult> BootControl::isSlotMarkedSuccessful(
- uint32_t slot) {
- if (getNumberSlots() == 0) {
- // just return true so that we don't we another call trying to mark it as successful
- // when there is no slots
- return BoolResult::TRUE;
- }
- if (slot >= getNumberSlots())
- return BoolResult::INVALID_SLOT;
-
- bool successful;
- if (isDevInfoValid()) {
- auto &slot_data = devinfo.ab_data.slots[slot];
- successful = !!slot_data.successful;
- } else {
- successful = isSlotFlagSet(slot, AB_ATTR_SUCCESSFUL);
- }
-
- return successful ? BoolResult::TRUE : BoolResult::FALSE;
-}
-
-Return<void> BootControl::getSuffix(uint32_t slot, getSuffix_cb _hidl_cb) {
- _hidl_cb(slot == 0 ? "_a" : slot == 1 ? "_b" : "");
- return Void();
-}
-
-// Methods from ::android::hardware::boot::V1_1::IBootControl follow.
-bool BootControl::Init() {
- return InitMiscVirtualAbMessageIfNeeded();
-}
-
-Return<bool> BootControl::setSnapshotMergeStatus(
- ::android::hardware::boot::V1_1::MergeStatus status) {
- return SetMiscVirtualAbMergeStatus(getCurrentSlot(), status);
-}
-
-Return<::android::hardware::boot::V1_1::MergeStatus> BootControl::getSnapshotMergeStatus() {
- MergeStatus status;
- if (!GetMiscVirtualAbMergeStatus(getCurrentSlot(), &status)) {
- return MergeStatus::UNKNOWN;
- }
- return status;
-}
-
-// Methods from ::android::hardware::boot::V1_2::IBootControl follow.
-Return<uint32_t> BootControl::getActiveBootSlot() {
- if (getNumberSlots() == 0)
- return 0;
-
- if (isDevInfoValid())
- return devinfo.ab_data.slots[1].active ? 1 : 0;
- return isSlotFlagSet(1, AB_ATTR_ACTIVE) ? 1 : 0;
-}
-
-// Methods from ::android::hidl::base::V1_0::IBase follow.
-
-IBootControl *HIDL_FETCH_IBootControl(const char * /* name */) {
- auto module = new BootControl();
-
- module->Init();
-
- return module;
-}
-
-} // namespace implementation
-} // namespace V1_2
-} // namespace boot
-} // namespace hardware
-} // namespace android
diff --git a/interfaces/boot/1.2/BootControl.h b/interfaces/boot/1.2/BootControl.h
deleted file mode 100644
index 17b5f0f..0000000
--- a/interfaces/boot/1.2/BootControl.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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.
- */
-
-#pragma once
-
-#include <android/hardware/boot/1.2/IBootControl.h>
-#include <hidl/MQDescriptor.h>
-#include <hidl/Status.h>
-
-namespace android {
-namespace hardware {
-namespace boot {
-namespace V1_2 {
-namespace implementation {
-
-using ::android::sp;
-using ::android::hardware::hidl_array;
-using ::android::hardware::hidl_memory;
-using ::android::hardware::hidl_string;
-using ::android::hardware::hidl_vec;
-using ::android::hardware::Return;
-using ::android::hardware::Void;
-
-struct BootControl : public IBootControl {
- bool Init();
-
- // Methods from ::android::hardware::boot::V1_0::IBootControl follow.
- Return<uint32_t> getNumberSlots() override;
- Return<uint32_t> getCurrentSlot() override;
- Return<void> markBootSuccessful(markBootSuccessful_cb _hidl_cb) override;
- Return<void> setActiveBootSlot(uint32_t slot, setActiveBootSlot_cb _hidl_cb) override;
- Return<void> setSlotAsUnbootable(uint32_t slot, setSlotAsUnbootable_cb _hidl_cb) override;
- Return<::android::hardware::boot::V1_0::BoolResult> isSlotBootable(uint32_t slot) override;
- Return<::android::hardware::boot::V1_0::BoolResult> isSlotMarkedSuccessful(
- uint32_t slot) override;
- Return<void> getSuffix(uint32_t slot, getSuffix_cb _hidl_cb) override;
-
- // Methods from ::android::hardware::boot::V1_1::IBootControl follow.
- Return<bool> setSnapshotMergeStatus(
- ::android::hardware::boot::V1_1::MergeStatus status) override;
- Return<::android::hardware::boot::V1_1::MergeStatus> getSnapshotMergeStatus() override;
-
- // Methods from ::android::hardware::boot::V1_2::IBootControl follow.
- Return<uint32_t> getActiveBootSlot() override;
-
- // Methods from ::android::hidl::base::V1_0::IBase follow.
-};
-
-// FIXME: most likely delete, this is only for passthrough implementations
-extern "C" IBootControl *HIDL_FETCH_IBootControl(const char *name);
-
-} // namespace implementation
-} // namespace V1_2
-} // namespace boot
-} // namespace hardware
-} // namespace android
diff --git a/interfaces/boot/1.2/DevInfo.h b/interfaces/boot/1.2/DevInfo.h
deleted file mode 100644
index a09a83a..0000000
--- a/interfaces/boot/1.2/DevInfo.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2021 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.
- */
-
-#pragma once
-
-namespace android {
-namespace hardware {
-namespace boot {
-namespace V1_2 {
-namespace implementation {
-
-//
-// definitions taken from ABL code
-//
-
-constexpr uint32_t DEVINFO_MAGIC = 0x49564544;
-constexpr size_t DEVINFO_AB_SLOT_COUNT = 2;
-
-struct devinfo_ab_slot_data_t {
- uint8_t retry_count;
- uint8_t unbootable : 1;
- uint8_t successful : 1;
- uint8_t active : 1;
- uint8_t fastboot_ok : 1;
- uint8_t : 4;
- uint8_t unused[2];
-} __attribute__((packed));
-
-typedef struct {
- devinfo_ab_slot_data_t slots[DEVINFO_AB_SLOT_COUNT];
-} __attribute__((packed)) devinfo_ab_data_t;
-
-struct devinfo_t {
- uint32_t magic;
- uint16_t ver_major;
- uint16_t ver_minor;
- uint8_t unused[40];
- devinfo_ab_data_t ab_data;
- uint8_t unused1[72]; // use remaining up to complete 128 bytes
-} __attribute__((packed));
-
-static_assert(sizeof(devinfo_t) == 128, "invalid devinfo struct size");
-
-} // namespace implementation
-} // namespace V1_2
-} // namespace boot
-} // namespace hardware
-} // namespace android
diff --git a/interfaces/boot/1.2/GptUtils.cpp b/interfaces/boot/1.2/GptUtils.cpp
deleted file mode 100644
index 25088e7..0000000
--- a/interfaces/boot/1.2/GptUtils.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-#define LOG_TAG "bootcontrolhal"
-
-#include "GptUtils.h"
-
-#include <android-base/file.h>
-#include <errno.h>
-#include <linux/fs.h>
-#include <log/log.h>
-#include <zlib.h>
-
-namespace android {
-namespace hardware {
-namespace boot {
-namespace V1_2 {
-namespace implementation {
-
-namespace {
-
-static int ValidateGptHeader(gpt_header *gpt) {
- if (gpt->signature != GPT_SIGNATURE) {
- ALOGE("invalid gpt signature 0x%lx\n", gpt->signature);
- return -1;
- }
-
- if (gpt->header_size != sizeof(gpt_header)) {
- ALOGE("invalid gpt header size %u\n", gpt->header_size);
- return -1;
- }
-
- if (gpt->entry_size != sizeof(gpt_entry)) {
- ALOGE("invalid gpt entry size %u\n", gpt->entry_size);
- return -1;
- }
-
- return 0;
-}
-
-} // namespace
-
-GptUtils::GptUtils(const std::string dev_path) : dev_path(dev_path), fd(0) {}
-
-int GptUtils::Load(void) {
- fd = open(dev_path.c_str(), O_RDWR);
- if (fd < 0) {
- ALOGE("failed to open block dev %s, %d\n", dev_path.c_str(), errno);
- return -1;
- }
-
- int ret = ioctl(fd, BLKSSZGET, &block_size);
- if (ret < 0) {
- ALOGE("failed to get block size %d\n", errno);
- return -1;
- }
-
- // read primary header
- lseek64(fd, block_size, SEEK_SET);
- ret = read(fd, &gpt_primary, sizeof gpt_primary);
- if (ret < 0) {
- ALOGE("failed to read gpt primary header %d\n", errno);
- return -1;
- }
-
- if (ValidateGptHeader(&gpt_primary)) {
- ALOGE("error validating gpt header\n");
- return -1;
- }
-
- // read partition entries
- entry_array.resize(gpt_primary.entry_count);
- uint32_t entries_size = gpt_primary.entry_size * gpt_primary.entry_count;
- lseek64(fd, block_size * gpt_primary.start_lba, SEEK_SET);
- ret = read(fd, entry_array.data(), entries_size);
- if (ret < 0) {
- ALOGE("failed to read gpt partition entries %d\n", errno);
- return -1;
- }
-
- // read gpt back header
- lseek64(fd, block_size * gpt_primary.backup_lba, SEEK_SET);
- ret = read(fd, &gpt_backup, sizeof gpt_backup);
- if (ret < 0) {
- ALOGE("failed to read gpt backup header %d\n", errno);
- return -1;
- }
-
- if (ValidateGptHeader(&gpt_backup)) {
- ALOGW("error validating gpt backup\n"); // just warn about it, not fail
- }
-
- // Create map <partition name, gpt_entry pointer>
- auto get_name = [](const uint16_t *efi_name) {
- char name[37] = {};
- for (int i = 0; efi_name[i] && i < sizeof name - 1; ++i) name[i] = efi_name[i];
- return std::string(name);
- };
-
- for (auto const &e : entry_array) {
- if (e.name[0] == 0)
- break; // stop at the first partition with no name
- std::string s = get_name(e.name);
- entries[s] = const_cast<gpt_entry *>(&e);
- }
-
- return 0;
-}
-
-gpt_entry *GptUtils::GetPartitionEntry(std::string name) {
- return entries.find(name) != entries.end() ? entries[name] : nullptr;
-}
-
-int GptUtils::Sync(void) {
- if (!fd)
- return -1;
-
- // calculate crc and check if we need to update gpt
- gpt_primary.entries_crc32 = crc32(0, reinterpret_cast<uint8_t *>(entry_array.data()),
- entry_array.size() * sizeof(gpt_entry));
-
- // save old crc
- uint32_t crc = gpt_primary.crc32;
- gpt_primary.crc32 = 0;
-
- gpt_primary.crc32 = crc32(0, reinterpret_cast<uint8_t *>(&gpt_primary), sizeof gpt_primary);
- if (crc == gpt_primary.crc32)
- return 0; // nothing to do (no changes)
-
- ALOGI("updating GPT\n");
-
- lseek64(fd, block_size * gpt_primary.current_lba, SEEK_SET);
- int ret = write(fd, &gpt_primary, sizeof gpt_primary);
- if (ret < 0) {
- ALOGE("failed to write gpt primary header %d\n", errno);
- return -1;
- }
-
- lseek64(fd, block_size * gpt_primary.start_lba, SEEK_SET);
- ret = write(fd, entry_array.data(), entry_array.size() * sizeof(gpt_entry));
- if (ret < 0) {
- ALOGE("failed to write gpt partition entries %d\n", errno);
- return -1;
- }
-
- // update GPT backup entries and backup
- lseek64(fd, block_size * gpt_backup.start_lba, SEEK_SET);
- ret = write(fd, entry_array.data(), entry_array.size() * sizeof(gpt_entry));
- if (ret < 0) {
- ALOGE("failed to write gpt backup partition entries %d\n", errno);
- return -1;
- }
-
- gpt_backup.entries_crc32 = gpt_primary.entries_crc32;
- gpt_backup.crc32 = 0;
- gpt_backup.crc32 = crc32(0, reinterpret_cast<uint8_t *>(&gpt_backup), sizeof gpt_backup);
- lseek64(fd, block_size * gpt_primary.backup_lba, SEEK_SET);
- ret = write(fd, &gpt_backup, sizeof gpt_backup);
- if (ret < 0) {
- ALOGE("failed to write gpt backup header %d\n", errno);
- return -1;
- }
-
- fsync(fd);
-
- return 0;
-}
-
-GptUtils::~GptUtils() {
- if (fd) {
- Sync();
- close(fd);
- }
-}
-
-} // namespace implementation
-} // namespace V1_2
-} // namespace boot
-} // namespace hardware
-} // namespace android
diff --git a/interfaces/boot/1.2/GptUtils.h b/interfaces/boot/1.2/GptUtils.h
deleted file mode 100644
index a2bed33..0000000
--- a/interfaces/boot/1.2/GptUtils.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-#pragma once
-
-#include <map>
-#include <string>
-#include <vector>
-
-namespace android {
-namespace hardware {
-namespace boot {
-namespace V1_2 {
-namespace implementation {
-
-#define GPT_SIGNATURE 0x5452415020494645UL
-
-typedef struct {
- uint8_t type_guid[16];
- uint8_t guid[16];
- uint64_t first_lba;
- uint64_t last_lba;
- uint64_t attr;
- uint16_t name[36];
-} __attribute__((packed)) gpt_entry;
-
-typedef struct {
- uint64_t signature;
- uint32_t revision;
- uint32_t header_size;
- uint32_t crc32;
- uint32_t reserved;
- uint64_t current_lba;
- uint64_t backup_lba;
- uint64_t first_usable_lba;
- uint64_t last_usable_lba;
- uint8_t disk_guid[16];
- uint64_t start_lba;
- uint32_t entry_count;
- uint32_t entry_size;
- uint32_t entries_crc32;
-} __attribute__((packed)) gpt_header;
-
-class GptUtils {
- public:
- GptUtils(const std::string dev_path);
- int Load(void);
- gpt_entry *GetPartitionEntry(std::string name);
- int Sync(void);
- ~GptUtils();
-
- private:
- std::string dev_path;
- int fd;
- uint32_t block_size;
- gpt_header gpt_primary;
- gpt_header gpt_backup;
- std::vector<gpt_entry> entry_array;
- std::map<std::string, gpt_entry *> entries;
-};
-
-} // namespace implementation
-} // namespace V1_2
-} // namespace boot
-} // namespace hardware
-} // namespace android
diff --git a/interfaces/boot/1.2/android.hardware.boot@1.2-service-gs201.rc b/interfaces/boot/1.2/android.hardware.boot@1.2-service-gs201.rc
deleted file mode 100644
index 3457b5f..0000000
--- a/interfaces/boot/1.2/android.hardware.boot@1.2-service-gs201.rc
+++ /dev/null
@@ -1,7 +0,0 @@
-service vendor.boot-hal-1-2 /vendor/bin/hw/android.hardware.boot@1.2-service-gs201
- interface android.hardware.boot@1.0::IBootControl default
- interface android.hardware.boot@1.1::IBootControl default
- interface android.hardware.boot@1.2::IBootControl default
- class early_hal
- user root
- group root
diff --git a/interfaces/boot/1.2/service.cpp b/interfaces/boot/1.2/service.cpp
deleted file mode 100644
index f07682e..0000000
--- a/interfaces/boot/1.2/service.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.
- */
-
-#define LOG_TAG "android.hardware.boot@1.2-service"
-
-#include <android/hardware/boot/1.2/IBootControl.h>
-#include <hidl/HidlTransportSupport.h>
-#include <hidl/Status.h>
-#include <log/log.h>
-
-#include "BootControl.h"
-
-using ::android::status_t;
-
-using ::android::hardware::boot::V1_2::IBootControl;
-
-using ::android::hardware::boot::V1_2::implementation::BootControl;
-// using ::android::hardware::boot::implementation::BootControl;
-
-int main(int /* argc */, char * /* argv */[]) {
- // This function must be called before you join to ensure the proper
- // number of threads are created. The threadpool will never exceed
- // size one because of this call.
- ::android::hardware::configureRpcThreadpool(1 /*threads*/, true /*willJoin*/);
-
- ::android::sp bootctrl = new BootControl();
- const status_t status = bootctrl->registerAsService();
- if (status != ::android::OK) {
- return 1; // or handle error
- }
-
- // Adds this thread to the threadpool, resulting in one total
- // thread in the threadpool. We could also do other things, but
- // would have to specify 'false' to willJoin in configureRpcThreadpool.
- ::android::hardware::joinRpcThreadpool();
- return 1; // joinRpcThreadpool should never return
-}
diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml
index fee0455..cd40520 100644
--- a/manifest-gralloc3.xml
+++ b/manifest-gralloc3.xml
@@ -68,10 +68,9 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl">
+ <hal format="aidl">
<name>android.hardware.boot</name>
- <transport>hwbinder</transport>
- <fqname>@1.2::IBootControl/default</fqname>
+ <fqname>IBootControl/default</fqname>
</hal>
<hal format="hidl">
<name>android.hardware.sensors</name>
@@ -97,7 +96,7 @@
</hal>
<hal format="aidl">
<name>vendor.google.google_battery</name>
- <version>2</version>
+ <version>2-3</version>
<interface>
<name>IGoogleBattery</name>
<instance>default</instance>
diff --git a/manifest.xml b/manifest.xml
index 031b46f..a5cf98d 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -8,10 +8,9 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl">
+ <hal format="aidl">
<name>android.hardware.boot</name>
- <transport>hwbinder</transport>
- <fqname>@1.2::IBootControl/default</fqname>
+ <fqname>IBootControl/default</fqname>
</hal>
<hal format="aidl">
<name>com.google.input</name>
diff --git a/media_codecs_bo_c2.xml b/media_codecs_bo_c2.xml
index b57a92a..3a39726 100644
--- a/media_codecs_bo_c2.xml
+++ b/media_codecs_bo_c2.xml
@@ -29,7 +29,7 @@
<Limit name="performance-point-1920x1080" value="180" />
<Limit name="performance-point-1920x1079" value="120" />
<Limit name="performance-point-3840x2160" value="60" />
- <!--Feature name="adaptive-playback" /-->
+ <Feature name="adaptive-playback" />
</MediaCodec>
<MediaCodec name="c2.google.av1.decoder.secure" type="video/av01">
<Limit name="size" min="96x96" max="3840x2160" />
@@ -43,7 +43,7 @@
<Limit name="performance-point-1920x1080" value="180" />
<Limit name="performance-point-1920x1079" value="120" />
<Limit name="performance-point-3840x2160" value="60" />
- <!--Feature name="adaptive-playback" /-->
+ <Feature name="adaptive-playback" />
<Feature name="secure-playback" required="true" />
</MediaCodec>
</Decoders>
diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml
index 13609f2..12dde41 100644
--- a/media_codecs_performance_c2.xml
+++ b/media_codecs_performance_c2.xml
@@ -173,6 +173,12 @@
<Limit name="measured-frame-rate-720x480" range="106-148" />
<Limit name="measured-frame-rate-1280x720" range="65-71" />
</MediaCodec>
+ <MediaCodec name="c2.android.av1-dav1d.decoder" type="video/av01" update="true">
+ <Limit name="measured-frame-rate-352x288" range="358-383" />
+ <Limit name="measured-frame-rate-640x360" range="207-221" />
+ <Limit name="measured-frame-rate-720x480" range="106-148" />
+ <Limit name="measured-frame-rate-1280x720" range="65-71" />
+ </MediaCodec>
</Decoders>
<Encoders>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 3f1e2c1..e9e4f01 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -215,7 +215,7 @@
<!-- Default color temperature, in Kelvin, to tint the screen when night display is
activated. -->
- <integer name="config_nightDisplayColorTemperatureDefault">3339</integer>
+ <integer name="config_nightDisplayColorTemperatureDefault">4000</integer>
<!-- Whether the device enable the standalone (SA) mode of 5G NR.-->
<bool name="config_telephony5gStandalone">true</bool>
@@ -252,6 +252,9 @@
<!-- Should the pinner service pin the Home application? -->
<bool name="config_pinnerHomeApp">true</bool>
+ <!-- Bytes that the PinnerService will pin for WebView -->
+ <integer name="config_pinnerWebviewPinBytes">20971520</integer>
+
<!-- The default intensity level for alarm vibrations. See
Settings.System.ALARM_VIBRATION_INTENSITY more details on the constant values and
meanings. -->
@@ -292,4 +295,28 @@
<!-- Enable variable refresh rate when typing. -->
<bool name="config_variableRefreshRateTypingSupported">false</bool>
-</resources>
+
+ <!-- The list of packages to automatically opt in of fresh rate suppressing by small area
+ detection. Format of this array should be packageName:threshold and threshold value should
+ be between 0 to 1-->
+ <string-array name="config_smallAreaDetectionAllowlist" translatable="false">
+ <!-- Add packages:threshold here -->
+ <item>com.tencent.mm:0.07</item>
+ <item>com.facebook.katana:0.07</item>
+ <item>com.instagram.android:0.07</item>
+ <item>com.spotify.music:0.05</item>
+ <item>com.reddit.frontpage:0.07</item>
+ <item>com.zhiliaoapp.musically:0.07</item>
+ <item>com.bilibili.app.in:0.07</item>
+ <item>com.twitter.android:0.07</item>
+ </string-array>
+
+ <!-- Pre-scale volume at volume step 1 for Absolute Volume -->
+ <fraction name="config_prescaleAbsoluteVolume_index1">100%</fraction>
+
+ <!-- Pre-scale volume at volume step 2 for Absolute Volume -->
+ <fraction name="config_prescaleAbsoluteVolume_index2">100%</fraction>
+
+ <!-- Pre-scale volume at volume step 3 for Absolute Volume -->
+ <fraction name="config_prescaleAbsoluteVolume_index3">100%</fraction>
+ </resources>
diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index b7df808..5d739b1 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -44,6 +44,10 @@
.ImpedancePath = "/sys/devices/platform/audiometrics/speaker_impedance",
.CodecPath = "/sys/devices/platform/audiometrics/codec_state",
.EEPROMPath = "/dev/battery_history",
+ .MitigationPath = "/sys/devices/virtual/pmic/mitigation",
+ .MitigationDurationPath = "/sys/devices/virtual/pmic/mitigation/irq_dur_cnt",
+ .BrownoutReasonProp = "vendor.brownout_reason",
+ .BrownoutLogPath = "/data/vendor/mitigation/lastmeal.txt",
.SpeakerTemperaturePath = "/sys/devices/platform/audiometrics/speaker_temp",
.SpeakerExcursionPath = "/sys/devices/platform/audiometrics/speaker_excursion",
.SpeakerHeartBeatPath = "/sys/devices/platform/audiometrics/speaker_heartbeat",
@@ -83,7 +87,8 @@
.StormIRQMetricsPath = "/sys/kernel/metrics/irq/storm_irq_metrics",
.IRQStatsResetPath = "/sys/kernel/metrics/irq/stats_reset",
.ModemPcieLinkStatsPath = "/sys/devices/platform/11920000.pcie/link_stats",
- .WifiPcieLinkStatsPath = "/sys/devices/platform/14520000.pcie/link_stats"
+ .WifiPcieLinkStatsPath = "/sys/devices/platform/14520000.pcie/link_stats",
+ .GMSRPath = "/sys/class/power_supply/maxfg/gmsr"
};
const struct UeventListener::UeventPaths ueventPaths = {
diff --git a/preinstalled-packages-product-gs201-device-debug.xml b/preinstalled-packages-product-gs201-device-debug.xml
index a0b67c3..58eb9db 100644
--- a/preinstalled-packages-product-gs201-device-debug.xml
+++ b/preinstalled-packages-product-gs201-device-debug.xml
@@ -22,6 +22,7 @@
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
+ <do-not-install-in user-type="android.os.usertype.profile.PRIVATE" />
</install-in-user-type>
<!-- RCS (Rich Communication Services)
@@ -31,5 +32,6 @@
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
+ <do-not-install-in user-type="android.os.usertype.profile.PRIVATE" />
</install-in-user-type>
</config>
diff --git a/task_profiles.json b/task_profiles.json
index 961857d..fda6c3e 100644
--- a/task_profiles.json
+++ b/task_profiles.json
@@ -7,8 +7,8 @@
"Name": "WriteFile",
"Params":
{
- "FilePath": "/proc/vendor_sched/set_task_group_ta",
- "ProcFilePath": "/proc/vendor_sched/set_proc_group_ta",
+ "FilePath": "/proc/vendor_sched/groups/ta/set_task_group",
+ "ProcFilePath": "/proc/vendor_sched/groups/ta/set_proc_group",
"Value": "<pid>",
"LogFailures": "false"
}
@@ -22,8 +22,8 @@
"Name": "WriteFile",
"Params":
{
- "FilePath": "/proc/vendor_sched/set_task_group_cam",
- "ProcFilePath": "/proc/vendor_sched/set_proc_group_cam",
+ "FilePath": "/proc/vendor_sched/groups/cam/set_task_group",
+ "ProcFilePath": "/proc/vendor_sched/groups/cam/set_proc_group",
"Value": "<pid>",
"LogFailures": "false"
}
@@ -37,8 +37,8 @@
"Name": "WriteFile",
"Params":
{
- "FilePath": "/proc/vendor_sched/set_task_group_cam_power",
- "ProcFilePath": "/proc/vendor_sched/set_proc_group_cam_power",
+ "FilePath": "/proc/vendor_sched/groups/cam_power/set_task_group",
+ "ProcFilePath": "/proc/vendor_sched/groups/cam_power/set_proc_group",
"Value": "<pid>",
"LogFailures": "false"
}
@@ -52,8 +52,8 @@
"Name": "WriteFile",
"Params":
{
- "FilePath": "/proc/vendor_sched/set_task_group_dex2oat",
- "ProcFilePath": "/proc/vendor_sched/set_proc_group_dex2oat",
+ "FilePath": "/proc/vendor_sched/groups/dex2oat/set_task_group",
+ "ProcFilePath": "/proc/vendor_sched/groups/dex2oat/set_proc_group",
"Value": "<pid>",
"LogFailures": "false"
}
@@ -67,8 +67,8 @@
"Name": "WriteFile",
"Params":
{
- "FilePath": "/proc/vendor_sched/set_task_group_ota",
- "ProcFilePath": "/proc/vendor_sched/set_proc_group_ota",
+ "FilePath": "/proc/vendor_sched/groups/ota/set_task_group",
+ "ProcFilePath": "/proc/vendor_sched/groups/ota/set_proc_group",
"Value": "<pid>",
"LogFailures": "false"
}
@@ -121,8 +121,8 @@
"Name": "WriteFile",
"Params":
{
- "FilePath": "/proc/vendor_sched/set_task_group_bg",
- "ProcFilePath": "/proc/vendor_sched/set_proc_group_bg",
+ "FilePath": "/proc/vendor_sched/groups/bg/set_task_group",
+ "ProcFilePath": "/proc/vendor_sched/groups/bg/set_proc_group",
"Value": "<pid>",
"LogFailures": "false"
}
@@ -136,8 +136,8 @@
"Name": "WriteFile",
"Params":
{
- "FilePath": "/proc/vendor_sched/set_task_group_sys",
- "ProcFilePath": "/proc/vendor_sched/set_proc_group_sys",
+ "FilePath": "/proc/vendor_sched/groups/sys/set_task_group",
+ "ProcFilePath": "/proc/vendor_sched/groups/sys/set_proc_group",
"Value": "<pid>",
"LogFailures": "false"
}
@@ -151,8 +151,8 @@
"Name": "WriteFile",
"Params":
{
- "FilePath": "/proc/vendor_sched/set_task_group_fg",
- "ProcFilePath": "/proc/vendor_sched/set_proc_group_fg",
+ "FilePath": "/proc/vendor_sched/groups/fg/set_task_group",
+ "ProcFilePath": "/proc/vendor_sched/groups/fg/set_proc_group",
"Value": "<pid>",
"LogFailures": "false"
}
@@ -166,8 +166,8 @@
"Name": "WriteFile",
"Params":
{
- "FilePath": "/proc/vendor_sched/set_task_group_ta",
- "ProcFilePath": "/proc/vendor_sched/set_proc_group_ta",
+ "FilePath": "/proc/vendor_sched/groups/ta/set_task_group",
+ "ProcFilePath": "/proc/vendor_sched/groups/ta/set_proc_group",
"Value": "<pid>",
"LogFailures": "false"
}
@@ -181,8 +181,8 @@
"Name": "WriteFile",
"Params":
{
- "FilePath": "/proc/vendor_sched/set_task_group_nnapi",
- "ProcFilePath": "/proc/vendor_sched/set_proc_group_nnapi",
+ "FilePath": "/proc/vendor_sched/groups/nnapi/set_task_group",
+ "ProcFilePath": "/proc/vendor_sched/groups/nnapi/set_proc_group",
"Value": "<pid>",
"LogFailures": "false"
}
@@ -196,8 +196,8 @@
"Name": "WriteFile",
"Params":
{
- "FilePath": "/proc/vendor_sched/set_task_group_sysbg",
- "ProcFilePath": "/proc/vendor_sched/set_proc_group_sysbg",
+ "FilePath": "/proc/vendor_sched/groups/sys_bg/set_task_group",
+ "ProcFilePath": "/proc/vendor_sched/groups/sys_bg/set_proc_group",
"Value": "<pid>",
"LogFailures": "false"
}
@@ -219,8 +219,8 @@
"Name": "WriteFile",
"Params":
{
- "FilePath": "/proc/vendor_sched/set_task_group_sf",
- "ProcFilePath": "/proc/vendor_sched/set_proc_group_sf",
+ "FilePath": "/proc/vendor_sched/groups/sf/set_task_group",
+ "ProcFilePath": "/proc/vendor_sched/groups/sf/set_proc_group",
"Value": "<pid>",
"LogFailures": "false"
}
@@ -242,8 +242,8 @@
"Name": "WriteFile",
"Params":
{
- "FilePath": "/proc/vendor_sched/set_task_group_rt",
- "ProcFilePath": "/proc/vendor_sched/set_proc_group_rt",
+ "FilePath": "/proc/vendor_sched/groups/rt/set_task_group",
+ "ProcFilePath": "/proc/vendor_sched/groups/rt/set_proc_group",
"Value": "<pid>",
"LogFailures": "false"
}
diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp
index b9d6018..609af17 100644
--- a/usb/usb/Android.bp
+++ b/usb/usb/Android.bp
@@ -34,6 +34,7 @@
srcs: [
"service.cpp",
"Usb.cpp",
+ "UsbDataSessionMonitor.cpp",
],
shared_libs: [
"libbase",
@@ -47,20 +48,29 @@
"android.hardware.thermal@2.0",
"android.hardware.thermal-V1-ndk",
"android.hardware.usb.gadget@1.0",
- "android.hardware.usb-V2-ndk",
+ "android.hardware.usb-V3-ndk",
"android.hardware.usb.gadget-V1-ndk",
"libcutils",
- "android.frameworks.stats-V1-ndk",
+ "android.frameworks.stats-V2-ndk",
"pixelatoms-cpp",
"libbinder_ndk",
+ "libprotobuf-cpp-lite",
+ "server_configurable_flags",
],
static_libs: [
"libpixelusb-aidl",
"libpixelstats",
"libthermalutils",
+ "android.hardware.usb.flags-aconfig-c-lib",
],
export_shared_lib_headers: [
- "android.frameworks.stats-V1-ndk",
+ "android.frameworks.stats-V2-ndk",
"pixelatoms-cpp",
],
}
+
+cc_aconfig_library {
+ name: "android.hardware.usb.flags-aconfig-c-lib",
+ vendor: true,
+ aconfig_declarations: "android.hardware.usb.flags-aconfig",
+}
diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp
index 0cbc98c..555e657 100644
--- a/usb/usb/Usb.cpp
+++ b/usb/usb/Usb.cpp
@@ -29,7 +29,6 @@
#include <sys/types.h>
#include <unistd.h>
#include <usbhost/usbhost.h>
-#include <chrono>
#include <regex>
#include <thread>
#include <unordered_map>
@@ -43,9 +42,12 @@
#include "Usb.h"
#include <aidl/android/frameworks/stats/IStats.h>
+#include <android_hardware_usb_flags.h>
#include <pixelusb/UsbGadgetAidlCommon.h>
#include <pixelstats/StatsHelper.h>
+namespace usb_flags = android::hardware::usb::flags;
+
using aidl::android::frameworks::stats::IStats;
using android::base::GetProperty;
using android::base::Tokenize;
@@ -71,6 +73,7 @@
constexpr char kComplianceWarningDebugAccessory[] = "debug-accessory";
constexpr char kComplianceWarningMissingRp[] = "missing_rp";
constexpr char kComplianceWarningOther[] = "other";
+constexpr char kComplianceWarningInputPowerLimited[] = "input_power_limited";
constexpr char kContaminantDetectionPath[] = "i2c-max77759tcpc/contaminant_detection";
constexpr char kStatusPath[] = "i2c-max77759tcpc/contaminant_detection_status";
constexpr char kSinkLimitEnable[] = "i2c-max77759tcpc/usb_limit_sink_enable";
@@ -87,6 +90,18 @@
constexpr char kPogoUsbActive[] = "/sys/devices/platform/google,pogo/pogo_usb_active";
constexpr char KPogoMoveDataToUsb[] = "/sys/devices/platform/google,pogo/move_data_to_usb";
constexpr char kPowerSupplyUsbType[] = "/sys/class/power_supply/usb/usb_type";
+constexpr char kUdcUeventRegex[] =
+ "/devices/platform/11210000.usb/11210000.dwc3/udc/11210000.dwc3";
+constexpr char kUdcStatePath[] =
+ "/sys/devices/platform/11210000.usb/11210000.dwc3/udc/11210000.dwc3/state";
+constexpr char kHost1UeventRegex[] =
+ "/devices/platform/11210000.usb/11210000.dwc3/xhci-hcd-exynos.[0-9].auto/usb2/2-0:1.0";
+constexpr char kHost1StatePath[] = "/sys/bus/usb/devices/usb2/2-0:1.0/usb2-port1/state";
+constexpr char kHost2UeventRegex[] =
+ "/devices/platform/11210000.usb/11210000.dwc3/xhci-hcd-exynos.[0-9].auto/usb3/3-0:1.0";
+constexpr char kHost2StatePath[] = "/sys/bus/usb/devices/usb3/3-0:1.0/usb3-port1/state";
+constexpr char kDataRolePath[] = "/sys/devices/platform/11210000.usb/new_data_role";
+
constexpr int kSamplingIntervalSec = 5;
void queryVersionHelper(android::hardware::usb::Usb *usb,
std::vector<PortStatus> *currentPortStatus);
@@ -322,9 +337,20 @@
continue;
}
if (!strncmp(reason.c_str(), kComplianceWarningOther,
- strlen(kComplianceWarningOther))) {
- (*currentPortStatus)[i].complianceWarnings.push_back(ComplianceWarning::OTHER);
- continue;
+ strlen(kComplianceWarningOther)) ||
+ !strncmp(reason.c_str(), kComplianceWarningInputPowerLimited,
+ strlen(kComplianceWarningInputPowerLimited))) {
+ if (usb_flags::enable_usb_data_compliance_warning() &&
+ usb_flags::enable_input_power_limited_warning()) {
+ ALOGI("Report through INPUT_POWER_LIMITED warning");
+ (*currentPortStatus)[i].complianceWarnings.push_back(
+ ComplianceWarning::INPUT_POWER_LIMITED);
+ continue;
+ } else {
+ (*currentPortStatus)[i].complianceWarnings.push_back(
+ ComplianceWarning::OTHER);
+ continue;
+ }
}
}
if ((*currentPortStatus)[i].complianceWarnings.size() > 0 &&
@@ -512,11 +538,20 @@
return NULL;
}
+void updatePortStatus(android::hardware::usb::Usb *usb) {
+ std::vector<PortStatus> currentPortStatus;
+
+ queryVersionHelper(usb, ¤tPortStatus);
+}
+
Usb::Usb()
: mLock(PTHREAD_MUTEX_INITIALIZER),
mRoleSwitchLock(PTHREAD_MUTEX_INITIALIZER),
mPartnerLock(PTHREAD_MUTEX_INITIALIZER),
mPartnerUp(false),
+ mUsbDataSessionMonitor(kUdcUeventRegex, kUdcStatePath, kHost1UeventRegex, kHost1StatePath,
+ kHost2UeventRegex, kHost2StatePath, kDataRolePath,
+ std::bind(&updatePortStatus, this)),
mOverheat(ZoneInfo(TemperatureType::USB_PORT, kThermalZoneForTrip,
ThrottlingSeverity::CRITICAL),
{ZoneInfo(TemperatureType::UNKNOWN, kThermalZoneForTempReadPrimary,
@@ -896,6 +931,18 @@
return Status::ERROR;
}
+void queryUsbDataSession(android::hardware::usb::Usb *usb,
+ std::vector<PortStatus> *currentPortStatus) {
+ std::vector<ComplianceWarning> warnings;
+
+ usb->mUsbDataSessionMonitor.getComplianceWarnings(
+ (*currentPortStatus)[0].currentDataRole, &warnings);
+ (*currentPortStatus)[0].complianceWarnings.insert(
+ (*currentPortStatus)[0].complianceWarnings.end(),
+ warnings.begin(),
+ warnings.end());
+}
+
void queryVersionHelper(android::hardware::usb::Usb *usb,
std::vector<PortStatus> *currentPortStatus) {
Status status;
@@ -904,6 +951,7 @@
queryMoistureDetectionStatus(currentPortStatus);
queryPowerTransferStatus(currentPortStatus);
queryNonCompliantChargerStatus(currentPortStatus);
+ queryUsbDataSession(usb, currentPortStatus);
if (usb->mCallback != NULL) {
ScopedAStatus ret = usb->mCallback->notifyPortStatusChange(*currentPortStatus,
status);
diff --git a/usb/usb/Usb.h b/usb/usb/Usb.h
index e45a5ed..495a467 100644
--- a/usb/usb/Usb.h
+++ b/usb/usb/Usb.h
@@ -21,6 +21,7 @@
#include <aidl/android/hardware/usb/BnUsbCallback.h>
#include <pixelusb/UsbOverheatEvent.h>
#include <utils/Log.h>
+#include <UsbDataSessionMonitor.h>
#define UEVENT_MSG_LEN 2048
// The type-c stack waits for 4.5 - 5.5 secs before declaring a port non-pd.
@@ -87,6 +88,8 @@
// Variable to signal partner coming back online after type switch
bool mPartnerUp;
+ // Report usb data session event and data incompliance warnings
+ UsbDataSessionMonitor mUsbDataSessionMonitor;
// Usb Overheat object for push suez event
UsbOverheatEvent mOverheat;
// Temperature when connected
@@ -96,6 +99,7 @@
// Usb hub vendor command settings for JK level tuning
int mUsbHubVendorCmdValue;
int mUsbHubVendorCmdIndex;
+
private:
pthread_t mPoll;
pthread_t mUsbHost;
diff --git a/usb/usb/UsbDataSessionMonitor.cpp b/usb/usb/UsbDataSessionMonitor.cpp
new file mode 100644
index 0000000..77defb3
--- /dev/null
+++ b/usb/usb/UsbDataSessionMonitor.cpp
@@ -0,0 +1,420 @@
+/*
+ * Copyright (C) 2023 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.
+ */
+
+#define LOG_TAG "android.hardware.usb.aidl-service.UsbDataSessionMonitor"
+
+#include "UsbDataSessionMonitor.h"
+
+#include <aidl/android/frameworks/stats/IStats.h>
+#include <android-base/file.h>
+#include <android-base/logging.h>
+#include <android_hardware_usb_flags.h>
+#include <cutils/uevent.h>
+#include <pixelstats/StatsHelper.h>
+#include <pixelusb/CommonUtils.h>
+#include <sys/epoll.h>
+#include <utils/Log.h>
+
+#include <regex>
+
+namespace usb_flags = android::hardware::usb::flags;
+
+using aidl::android::frameworks::stats::IStats;
+using android::base::ReadFileToString;
+using android::hardware::google::pixel::getStatsService;
+using android::hardware::google::pixel::reportUsbDataSessionEvent;
+using android::hardware::google::pixel::PixelAtoms::VendorUsbDataSessionEvent;
+using android::hardware::google::pixel::usb::addEpollFd;
+using android::hardware::google::pixel::usb::BuildVendorUsbDataSessionEvent;
+
+namespace aidl {
+namespace android {
+namespace hardware {
+namespace usb {
+
+#define UEVENT_MSG_LEN 2048
+#define USB_STATE_MAX_LEN 20
+#define DATA_ROLE_MAX_LEN 10
+
+constexpr char kUdcConfigfsPath[] = "/config/usb_gadget/g1/UDC";
+constexpr char kNotAttachedState[] = "not attached\n";
+constexpr char kAttachedState[] = "attached\n";
+constexpr char kPoweredState[] = "powered\n";
+constexpr char kDefaultState[] = "default\n";
+constexpr char kAddressedState[] = "addressed\n";
+constexpr char kConfiguredState[] = "configured\n";
+constexpr char kSuspendedState[] = "suspended\n";
+const std::set<std::string> kValidStates = {kNotAttachedState, kAttachedState, kPoweredState,
+ kDefaultState, kAddressedState, kConfiguredState,
+ kSuspendedState};
+
+static int addEpollFile(const int &epollFd, const std::string &filePath, unique_fd &fileFd) {
+ struct epoll_event ev;
+
+ unique_fd fd(open(filePath.c_str(), O_RDONLY));
+
+ if (fd.get() == -1) {
+ ALOGI("Cannot open %s", filePath.c_str());
+ return -1;
+ }
+
+ ev.data.fd = fd.get();
+ ev.events = EPOLLPRI;
+
+ if (epoll_ctl(epollFd, EPOLL_CTL_ADD, fd.get(), &ev) != 0) {
+ ALOGE("epoll_ctl failed; errno=%d", errno);
+ return -1;
+ }
+
+ fileFd = std::move(fd);
+ ALOGI("epoll registered %s", filePath.c_str());
+ return 0;
+}
+
+static void removeEpollFile(const int &epollFd, const std::string &filePath, unique_fd &fileFd) {
+ epoll_ctl(epollFd, EPOLL_CTL_DEL, fileFd.get(), NULL);
+ fileFd.release();
+
+ ALOGI("epoll unregistered %s", filePath.c_str());
+}
+
+UsbDataSessionMonitor::UsbDataSessionMonitor(
+ const std::string &deviceUeventRegex, const std::string &deviceStatePath,
+ const std::string &host1UeventRegex, const std::string &host1StatePath,
+ const std::string &host2UeventRegex, const std::string &host2StatePath,
+ const std::string &dataRolePath, std::function<void()> updatePortStatusCb) {
+ struct epoll_event ev;
+ std::string udc;
+
+ unique_fd epollFd(epoll_create(8));
+ if (epollFd.get() == -1) {
+ ALOGE("epoll_create failed; errno=%d", errno);
+ abort();
+ }
+
+ unique_fd ueventFd(uevent_open_socket(64 * 1024, true));
+ if (ueventFd.get() == -1) {
+ ALOGE("uevent_open_socket failed");
+ abort();
+ }
+ fcntl(ueventFd, F_SETFL, O_NONBLOCK);
+
+ if (addEpollFd(epollFd, ueventFd))
+ abort();
+
+ if (addEpollFile(epollFd.get(), dataRolePath, mDataRoleFd) != 0) {
+ ALOGE("monitor data role failed");
+ abort();
+ }
+
+ /*
+ * The device state file could be absent depending on the current data role
+ * and driver architecture. It's ok for addEpollFile to fail here, the file
+ * will be monitored later when its presence is detected by uevent.
+ */
+ mDeviceState.filePath = deviceStatePath;
+ mDeviceState.ueventRegex = deviceUeventRegex;
+ addEpollFile(epollFd.get(), mDeviceState.filePath, mDeviceState.fd);
+
+ mHost1State.filePath = host1StatePath;
+ mHost1State.ueventRegex = host1UeventRegex;
+ addEpollFile(epollFd.get(), mHost1State.filePath, mHost1State.fd);
+
+ mHost2State.filePath = host2StatePath;
+ mHost2State.ueventRegex = host2UeventRegex;
+ addEpollFile(epollFd.get(), mHost2State.filePath, mHost2State.fd);
+
+ mEpollFd = std::move(epollFd);
+ mUeventFd = std::move(ueventFd);
+ mUpdatePortStatusCb = updatePortStatusCb;
+
+ if (ReadFileToString(kUdcConfigfsPath, &udc) && !udc.empty())
+ mUdcBind = true;
+ else
+ mUdcBind = false;
+
+ if (pthread_create(&mMonitor, NULL, this->monitorThread, this)) {
+ ALOGE("pthread creation failed %d", errno);
+ abort();
+ }
+}
+
+UsbDataSessionMonitor::~UsbDataSessionMonitor() {}
+
+void UsbDataSessionMonitor::reportUsbDataSessionMetrics() {
+ std::vector<VendorUsbDataSessionEvent> events;
+
+ if (mDataRole == PortDataRole::DEVICE) {
+ VendorUsbDataSessionEvent event;
+ BuildVendorUsbDataSessionEvent(false /* is_host */, boot_clock::now(), mDataSessionStart,
+ &mDeviceState.states, &mDeviceState.timestamps, &event);
+ events.push_back(event);
+ } else if (mDataRole == PortDataRole::HOST) {
+ bool empty = true;
+ for (auto e : {&mHost1State, &mHost2State}) {
+ /*
+ * Host port will at least get an not_attached event after enablement,
+ * skip upload if no additional state is added.
+ */
+ if (e->states.size() > 1) {
+ VendorUsbDataSessionEvent event;
+ BuildVendorUsbDataSessionEvent(true /* is_host */, boot_clock::now(),
+ mDataSessionStart, &e->states, &e->timestamps,
+ &event);
+ events.push_back(event);
+ empty = false;
+ }
+ }
+ // All host ports have no state update, upload an event to reflect it
+ if (empty) {
+ VendorUsbDataSessionEvent event;
+ BuildVendorUsbDataSessionEvent(true /* is_host */, boot_clock::now(), mDataSessionStart,
+ &mHost1State.states, &mHost1State.timestamps, &event);
+ events.push_back(event);
+ }
+ } else {
+ return;
+ }
+
+ const std::shared_ptr<IStats> stats_client = getStatsService();
+ if (!stats_client) {
+ ALOGE("Unable to get AIDL Stats service");
+ return;
+ }
+
+ for (auto &event : events) {
+ reportUsbDataSessionEvent(stats_client, event);
+ }
+}
+
+void UsbDataSessionMonitor::getComplianceWarnings(const PortDataRole &role,
+ std::vector<ComplianceWarning> *warnings) {
+ if (!usb_flags::enable_report_usb_data_compliance_warning())
+ return;
+
+ if (role != mDataRole || role == PortDataRole::NONE)
+ return;
+
+ for (auto w : mWarningSet) {
+ warnings->push_back(w);
+ }
+}
+
+void UsbDataSessionMonitor::notifyComplianceWarning() {
+ if (!usb_flags::enable_report_usb_data_compliance_warning())
+ return;
+
+ if (mUpdatePortStatusCb)
+ mUpdatePortStatusCb();
+}
+
+void UsbDataSessionMonitor::evaluateComplianceWarning() {
+ std::set<ComplianceWarning> newWarningSet;
+
+ // TODO: add heuristics and update newWarningSet
+ if (mDataRole == PortDataRole::DEVICE && mUdcBind) {
+ } else if (mDataRole == PortDataRole::HOST) {
+ }
+
+ if (newWarningSet != mWarningSet) {
+ mWarningSet = newWarningSet;
+ notifyComplianceWarning();
+ }
+}
+
+void UsbDataSessionMonitor::clearDeviceStateEvents(struct usbDeviceState *deviceState) {
+ deviceState->states.clear();
+ deviceState->timestamps.clear();
+}
+
+void UsbDataSessionMonitor::handleDeviceStateEvent(struct usbDeviceState *deviceState) {
+ int n;
+ char state[USB_STATE_MAX_LEN] = {0};
+
+ lseek(deviceState->fd.get(), 0, SEEK_SET);
+ n = read(deviceState->fd.get(), &state, USB_STATE_MAX_LEN);
+
+ if (kValidStates.find(state) == kValidStates.end()) {
+ ALOGE("Invalid state %s", state);
+ return;
+ }
+
+ ALOGI("Update USB device state: %s", state);
+
+ deviceState->states.push_back(state);
+ deviceState->timestamps.push_back(boot_clock::now());
+ evaluateComplianceWarning();
+}
+
+void UsbDataSessionMonitor::handleDataRoleEvent() {
+ int n;
+ PortDataRole newDataRole;
+ char role[DATA_ROLE_MAX_LEN] = {0};
+
+ lseek(mDataRoleFd.get(), 0, SEEK_SET);
+ n = read(mDataRoleFd.get(), &role, DATA_ROLE_MAX_LEN);
+
+ ALOGI("Update USB data role %s", role);
+
+ if (!std::strcmp(role, "host")) {
+ newDataRole = PortDataRole::HOST;
+ } else if (!std::strcmp(role, "device")) {
+ newDataRole = PortDataRole::DEVICE;
+ } else {
+ newDataRole = PortDataRole::NONE;
+ }
+
+ if (newDataRole != mDataRole) {
+ // Upload metrics for the last data session that has ended
+ if (mDataRole == PortDataRole::HOST || (mDataRole == PortDataRole::DEVICE && mUdcBind)) {
+ reportUsbDataSessionMetrics();
+ }
+
+ // Set up for the new data session
+ mWarningSet.clear();
+ mDataRole = newDataRole;
+ mDataSessionStart = boot_clock::now();
+
+ if (newDataRole == PortDataRole::DEVICE) {
+ clearDeviceStateEvents(&mDeviceState);
+ } else if (newDataRole == PortDataRole::HOST) {
+ clearDeviceStateEvents(&mHost1State);
+ clearDeviceStateEvents(&mHost2State);
+ }
+ }
+}
+
+void UsbDataSessionMonitor::updateUdcBindStatus(const std::string &devname) {
+ std::string function;
+ bool newUdcBind;
+
+ /*
+ * /sys/class/udc/<udc>/function prints out name of currently running USB gadget driver
+ * Ref: https://www.kernel.org/doc/Documentation/ABI/stable/sysfs-class-udc
+ * Empty name string means the udc device is not bound and gadget is pulldown.
+ */
+ if (!ReadFileToString("/sys" + devname + "/function", &function))
+ return;
+
+ if (function == "")
+ newUdcBind = false;
+ else
+ newUdcBind = true;
+
+ if (newUdcBind == mUdcBind)
+ return;
+
+ if (mDataRole == PortDataRole::DEVICE) {
+ if (mUdcBind && !newUdcBind) {
+ /*
+ * Gadget soft pulldown: report metrics as the end of a data session and
+ * re-evaluate compliance warnings to clear existing warnings if any.
+ */
+ reportUsbDataSessionMetrics();
+ evaluateComplianceWarning();
+
+ } else if (!mUdcBind && newUdcBind) {
+ // Gadget soft pullup: reset and start accounting for a new data session.
+ clearDeviceStateEvents(&mDeviceState);
+ mDataSessionStart = boot_clock::now();
+ }
+ }
+
+ ALOGI("Udc bind status changes from %b to %b", mUdcBind, newUdcBind);
+ mUdcBind = newUdcBind;
+}
+
+void UsbDataSessionMonitor::handleUevent() {
+ char msg[UEVENT_MSG_LEN + 2];
+ char *cp;
+ int n;
+
+ n = uevent_kernel_multicast_recv(mUeventFd.get(), msg, UEVENT_MSG_LEN);
+ if (n <= 0)
+ return;
+ if (n >= UEVENT_MSG_LEN)
+ return;
+
+ msg[n] = '\0';
+ msg[n + 1] = '\0';
+ cp = msg;
+
+ while (*cp) {
+ for (auto e : {&mHost1State, &mHost2State}) {
+ if (std::regex_search(cp, std::regex(e->ueventRegex))) {
+ if (!strncmp(cp, "bind@", strlen("bind@"))) {
+ addEpollFile(mEpollFd.get(), e->filePath, e->fd);
+ } else if (!strncmp(cp, "unbind@", strlen("unbind@"))) {
+ removeEpollFile(mEpollFd.get(), e->filePath, e->fd);
+ }
+ }
+ }
+
+ // TODO: support bind@ unbind@ to detect dynamically allocated udc device
+ if (std::regex_search(cp, std::regex(mDeviceState.ueventRegex))) {
+ if (!strncmp(cp, "change@", strlen("change@"))) {
+ char *devname = cp + strlen("change@");
+ /*
+ * Udc device emits a KOBJ_CHANGE event on configfs driver bind and unbind.
+ * TODO: upstream udc driver emits KOBJ_CHANGE event BEFORE unbind is actually
+ * executed. Add a short delay to get the correct state while working on a fix
+ * upstream.
+ */
+ usleep(50000);
+ updateUdcBindStatus(devname);
+ }
+ }
+ /* advance to after the next \0 */
+ while (*cp++) {
+ }
+ }
+}
+
+void *UsbDataSessionMonitor::monitorThread(void *param) {
+ UsbDataSessionMonitor *monitor = (UsbDataSessionMonitor *)param;
+ struct epoll_event events[64];
+ int nevents = 0;
+
+ while (true) {
+ nevents = epoll_wait(monitor->mEpollFd.get(), events, 64, -1);
+ if (nevents == -1) {
+ if (errno == EINTR)
+ continue;
+ ALOGE("usb epoll_wait failed; errno=%d", errno);
+ break;
+ }
+
+ for (int n = 0; n < nevents; ++n) {
+ if (events[n].data.fd == monitor->mUeventFd.get()) {
+ monitor->handleUevent();
+ } else if (events[n].data.fd == monitor->mDataRoleFd.get()) {
+ monitor->handleDataRoleEvent();
+ } else if (events[n].data.fd == monitor->mDeviceState.fd.get()) {
+ monitor->handleDeviceStateEvent(&monitor->mDeviceState);
+ } else if (events[n].data.fd == monitor->mHost1State.fd.get()) {
+ monitor->handleDeviceStateEvent(&monitor->mHost1State);
+ } else if (events[n].data.fd == monitor->mHost2State.fd.get()) {
+ monitor->handleDeviceStateEvent(&monitor->mHost2State);
+ }
+ }
+ }
+ return NULL;
+}
+
+} // namespace usb
+} // namespace hardware
+} // namespace android
+} // namespace aidl
diff --git a/usb/usb/UsbDataSessionMonitor.h b/usb/usb/UsbDataSessionMonitor.h
new file mode 100644
index 0000000..596f378
--- /dev/null
+++ b/usb/usb/UsbDataSessionMonitor.h
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2023 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.
+ */
+
+#pragma once
+
+#include <aidl/android/hardware/usb/ComplianceWarning.h>
+#include <aidl/android/hardware/usb/PortDataRole.h>
+#include <android-base/chrono_utils.h>
+#include <android-base/unique_fd.h>
+
+#include <set>
+#include <string>
+#include <vector>
+
+namespace aidl {
+namespace android {
+namespace hardware {
+namespace usb {
+
+using ::aidl::android::hardware::usb::ComplianceWarning;
+using ::aidl::android::hardware::usb::PortDataRole;
+using ::android::base::boot_clock;
+using ::android::base::unique_fd;
+
+/*
+ * UsbDataSessionMonitor monitors the usb device state sysfs of 3 different usb devices
+ * including device mode (udc), host mode high-speed port and host mode super-speed port. It
+ * reports Suez metrics for each data session and also provides API to query the compliance
+ * warnings detected in the current usb data session.
+ */
+class UsbDataSessionMonitor {
+ public:
+ /*
+ * The host mode high-speed port and super-speed port can be assigned to either host1 or
+ * host2 without affecting functionality.
+ *
+ * UeventRegex: name regex of the device that's being monitored. The regex is matched against
+ * uevent to detect dynamic creation/deletion/change of the device.
+ * StatePath: usb device state sysfs path of the device, monitored by epoll.
+ * dataRolePath: path to the usb data role sysfs, monitored by epoll.
+ * updatePortStatusCb: the callback is invoked when the compliance warings changes.
+ */
+ UsbDataSessionMonitor(const std::string &deviceUeventRegex, const std::string &deviceStatePath,
+ const std::string &host1UeventRegex, const std::string &host1StatePath,
+ const std::string &host2UeventRegex, const std::string &host2StatePath,
+ const std::string &dataRolePath,
+ std::function<void()> updatePortStatusCb);
+ ~UsbDataSessionMonitor();
+ // Returns the compliance warnings detected in the current data session.
+ void getComplianceWarnings(const PortDataRole &role, std::vector<ComplianceWarning> *warnings);
+
+ private:
+ struct usbDeviceState {
+ unique_fd fd;
+ std::string filePath;
+ std::string ueventRegex;
+ // Usb device states reported by state sysfs
+ std::vector<std::string> states;
+ // Timestamps of when the usb device states were captured
+ std::vector<boot_clock::time_point> timestamps;
+ };
+
+ static void *monitorThread(void *param);
+ void handleUevent();
+ void handleDataRoleEvent();
+ void handleDeviceStateEvent(struct usbDeviceState *deviceState);
+ void clearDeviceStateEvents(struct usbDeviceState *deviceState);
+ void reportUsbDataSessionMetrics();
+ void evaluateComplianceWarning();
+ void notifyComplianceWarning();
+ void updateUdcBindStatus(const std::string &devname);
+
+ pthread_t mMonitor;
+ unique_fd mEpollFd;
+ unique_fd mUeventFd;
+ unique_fd mDataRoleFd;
+ struct usbDeviceState mDeviceState;
+ struct usbDeviceState mHost1State;
+ struct usbDeviceState mHost2State;
+ std::set<ComplianceWarning> mWarningSet;
+ // Callback function to notify the caller when there's a change in compliance warnings.
+ std::function<void()> mUpdatePortStatusCb;
+ /*
+ * Cache relevant info for a USB data session when one starts, including
+ * the data role and the time when the session starts.
+ */
+ PortDataRole mDataRole;
+ boot_clock::time_point mDataSessionStart;
+ /*
+ * In gadget mode: this indicates whether the udc device is bound to the configfs driver, which
+ * is done by userspace writing the udc device name to /config/usb_gadget/g1/UDC. When unbound,
+ * the gadget is in soft pulldown state and is expected not to enumerate. During gadget
+ * function switch, the udc device usually go through unbind and bind.
+ */
+ bool mUdcBind;
+};
+
+} // namespace usb
+} // namespace hardware
+} // namespace android
+} // namespace aidl
diff --git a/usb/usb/android.hardware.usb-service.xml b/usb/usb/android.hardware.usb-service.xml
index c3f07f5..7ac2067 100644
--- a/usb/usb/android.hardware.usb-service.xml
+++ b/usb/usb/android.hardware.usb-service.xml
@@ -1,7 +1,7 @@
<manifest version="1.0" type="device">
<hal format="aidl">
<name>android.hardware.usb</name>
- <version>2</version>
+ <version>3</version>
<interface>
<name>IUsb</name>
<instance>default</instance>
