From 5186bf4b9be78564e3f994342b1df84b88509678 Mon Sep 17 00:00:00 2001 From: Woody Lin Date: Sun, 5 Feb 2023 12:26:40 +0800 Subject: gs201: init.debug.rc: Enable etm/etm2dram when ramdump is enabled Bug: 265382296 Change-Id: Ib215551397a361f5734401173e62a15691e45425 --- conf/init.debug.rc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/init.debug.rc b/conf/init.debug.rc index 4d5e4c7..d609d7e 100644 --- a/conf/init.debug.rc +++ b/conf/init.debug.rc @@ -41,3 +41,8 @@ on property:ro.revision=PROTO1.1 setprop debug.hypervisor.metrics_tag "hwrev_a0" 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 + write /sys/devices/platform/exynos-etm/etm_on 1 + write /sys/devices/platform/etm2dram/arm 1 -- cgit v1.2.3 From 7784322539f41e94145df323631e416fa3b450a6 Mon Sep 17 00:00:00 2001 From: Mark Chang Date: Wed, 22 Mar 2023 12:06:01 +0000 Subject: Add new IScreenProtectorDetectorService to manifest. Fixes service not found: servicemanager: Could not find com.google.input.algos.spd.IScreenProtectorDetectorService/default in the VINTF manifest. bug: 260302317 Test: Boot ok and service found. Change-Id: Iaab9842bfdab1fa0b3b9f889bb70bcf452ff7702 Signed-off-by: Mark Chang --- device_framework_matrix_product.xml | 7 +++++++ manifest-gralloc3.xml | 7 +++++++ manifest.xml | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index e906ab0..0f63fa7 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -116,6 +116,13 @@ default + + com.google.input.algos.spd + + IScreenProtectorDetectorService + default + + com.google.input diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml index c890030..97a2fc0 100644 --- a/manifest-gralloc3.xml +++ b/manifest-gralloc3.xml @@ -97,6 +97,13 @@ hwbinder @1.3::IDevice/google-edgetpu + + com.google.input.algos.spd + + IScreenProtectorDetectorService + default + + com.google.input diff --git a/manifest.xml b/manifest.xml index 402cbba..6cd9fa5 100644 --- a/manifest.xml +++ b/manifest.xml @@ -23,6 +23,13 @@ @1.3::IDevice/google-armnn + + com.google.input.algos.spd + + IScreenProtectorDetectorService + default + + com.google.input -- cgit v1.2.3 From bd7200ed1569f0e0f96d049bdf30ff98c71e433c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Sat, 29 Apr 2023 09:29:45 +0000 Subject: Update SoC-specific Lyric config. Bug: 280124102 Test: presubmit Change-Id: Id7c494f62a0029badd290612b034e2411fb61565 --- device.mk | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/device.mk b/device.mk index 41c2f95..aeeb40e 100644 --- a/device.mk +++ b/device.mk @@ -559,18 +559,10 @@ else LOCAL_TARGET_PRODUCT := slider endif -$(call soong_config_set,google3a_config,soc,gs201) -$(call soong_config_set,google3a_config,gcam_awb,true) -$(call soong_config_set,google3a_config,ghawb_truetone,true) - -ifneq ($(wildcard vendor/google/services/LyricCameraHAL/src),) +# Lyric Camera HAL settings +include device/google/gs-common/camera/lyric.mk $(call soong_config_set,lyric,soc,gs201) -$(call soong_config_set,lyric,use_lyric_camera_hal,true) -# lyric::tuning_product is set in device-specific makefiles, -# such as device/google/${DEVICE}/device-${DEVICE}.mk - -$(call soong_config_set,gch,hwl_library,lyric) -endif +$(call soong_config_set,google3a_config,soc,gs201) # WiFi PRODUCT_PACKAGES += \ @@ -650,7 +642,6 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.camera.concurrent.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.concurrent.xml \ frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml\ frameworks/native/data/etc/android.hardware.camera.raw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.raw.xml\ - vendor/google/services/LyricCameraHAL/src/vendor.android.hardware.camera.preview-dis.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/vendor.android.hardware.camera.preview-dis.xml\ #PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \ @@ -1000,8 +991,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) #$(call inherit-product-if-exists, vendor/google_devices/common/exynos-vendor.mk) #$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4375/device-bcm.mk) include device/google/gs-common/sensors/sensors.mk -$(call inherit-product-if-exists, vendor/google/services/LyricCameraHAL/src/build/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google/camera/devices/whi/device-vendor.mk) PRODUCT_COPY_FILES += \ device/google/gs201/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \ -- cgit v1.2.3 From 1382fe78e08941eb5fde03624a2d44a2da9784dd Mon Sep 17 00:00:00 2001 From: Samuel Gosselin Date: Thu, 1 Jun 2023 03:16:58 +0000 Subject: gs201: support splitting modules between system/vendor_dlkm Currently, all gs201 targets have a system_dlkm image but their modules are stored on the vendor_dlkm partition. In order to support the staging kernel, modules have to be split across the system/vendor_dlkm images. This fix enables targets to define modules on the system_dlkm image. If so, the system/vendor_dlkm split will be honored. Otherwise, all modules will remain stored on the vendor_dlkm image. Test: - Build and flash aosp_panther, no errors. - Build and flash a target defining BOARD_SYSTEM_KERNEL_MODULES, ensure modules are correctly split across the two dlkm partitions. Bug: 285177263 Change-Id: I80131d97073ce666a9228a47c2fff94b76139a64 Signed-off-by: Samuel Gosselin --- BoardConfig-common.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 92dab88..f680441 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -411,7 +411,15 @@ BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/ven ifndef BOARD_VENDOR_KERNEL_MODULES_LOAD $(error vendor_dlkm.modules.load not found or empty) endif + +# staging kernels might have modules split between system/vendor_dlkm. If +# the target defined modules on the system_dlkm image, honor the split. +# Otherwise, assume all modules are stored on the vendor_dlkm image. +ifneq ($(BOARD_SYSTEM_KERNEL_MODULES),) +BOARD_VENDOR_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_MODULES_LOAD))) +else BOARD_VENDOR_KERNEL_MODULES := $(KERNEL_MODULES) +endif # Using BUILD_COPY_HEADERS BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true -- cgit v1.2.3 From 7de9995af837f75743b8398fee3fa8dedc4326aa Mon Sep 17 00:00:00 2001 From: Angela Wu Date: Fri, 2 Jun 2023 05:32:09 +0000 Subject: Allow access to video12 from applications. Change-Id: Ib5534999715d7f35fe21422e8846ec49a62a9b68 Test: same as ag/23052928 Bug: 267820687 --- conf/ueventd.gs201.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/ueventd.gs201.rc b/conf/ueventd.gs201.rc index 03308f7..b545d6a 100644 --- a/conf/ueventd.gs201.rc +++ b/conf/ueventd.gs201.rc @@ -76,7 +76,7 @@ # jpeg /dev/m2m1shot_jpeg 0660 media media -/dev/video12 0660 system system +/dev/video12 0666 system system # audio /dev/seiren 0660 system audio -- cgit v1.2.3 From 2c59ef36b1ea86c25cab2c4cdf900198232cacf5 Mon Sep 17 00:00:00 2001 From: qinyiyan Date: Wed, 7 Jun 2023 13:19:12 -0700 Subject: Increase the com.google.edgetpu.dba service version to 2 in the framework matrix xml. Bug: 279092299 Change-Id: Ied0a9cd3fa37b86071f7961380fc5457f9cdcbd6 --- device_framework_matrix_product.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 934ad20..463f03a 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -102,7 +102,7 @@ com.google.edgetpu.dba - 1 + 2 IDevice default -- cgit v1.2.3 From 7c1bd9d937459fa10d8593fc7912dd70a67121f1 Mon Sep 17 00:00:00 2001 From: joeshih Date: Sat, 17 Jun 2023 15:33:13 +0800 Subject: [SEPolicy]Change to gs-common. Bug: 28716739 Test: Forrest build to verify pass. Change-Id: I9f0de576e5ab9ec800dfff132fc9ab1ba3b6f7e2 --- device-common.mk | 3 --- device.mk | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/device-common.mk b/device-common.mk index 56b2e0e..5e3c511 100644 --- a/device-common.mk +++ b/device-common.mk @@ -30,9 +30,6 @@ endif PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml -# Factory OTA --include vendor/unbundled_google/packages/FactoryOtaPrebuilt/factoryota.mk - # Set system properties identifying the chipset PRODUCT_VENDOR_PROPERTIES += ro.soc.manufacturer=Google PRODUCT_VENDOR_PROPERTIES += ro.soc.model=GS201 diff --git a/device.mk b/device.mk index a67edd5..30e3325 100644 --- a/device.mk +++ b/device.mk @@ -32,6 +32,7 @@ include device/google/gs-common/radio/dump.mk include device/google/gs-common/umfw_stat/umfw_stat.mk include device/google/gs-common/gear/dumpstate/aidl.mk include device/google/gs-common/widevine/widevine.mk +include device/google/gs-common/sota_app/factoryota.mk TARGET_BOARD_PLATFORM := gs201 -- cgit v1.2.3 From 2a4d72f8947a7b7e97ba55c945c89011f2b0eaa2 Mon Sep 17 00:00:00 2001 From: Habib Moukalled Date: Mon, 26 Jun 2023 20:17:14 +0000 Subject: Updating VINTF manifest for IDebugManager. Notes: - Updating AIDL HAL for IDebugManager. Bug: 284165549 Test: build test Change-Id: I07aad9ee651d299d294b6c6627baa33ae65f6099 --- device_framework_matrix_product.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 463f03a..aab556a 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -82,7 +82,7 @@ com.google.face.debug - 2 + 3 IDebugHost default -- cgit v1.2.3 From ae51b7425bc79522fcabe653b6477251a83f7f4e Mon Sep 17 00:00:00 2001 From: guibing Date: Wed, 28 Jun 2023 22:17:01 +0000 Subject: init: reduce the boot boost uclamp min. Use a moderate boost instead of fmax out of thermal constraints. Bug: 284039815 Test: boot ab tests Change-Id: Ie8d321e20d64e97d2896f6e5cf6f437dede84928 --- conf/init.gs201.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index ea2d57b..00e91c6 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -163,11 +163,11 @@ on init mkdir /dev/socket/pdx/system/vr/sensors 0775 system system # Boot time 183626384 - write /proc/vendor_sched/ta_uclamp_min 1024 + write /proc/vendor_sched/ta_uclamp_min 159 write /proc/vendor_sched/ta_prefer_idle 1 - write /proc/vendor_sched/fg_uclamp_min 1024 + write /proc/vendor_sched/fg_uclamp_min 159 write /proc/vendor_sched/fg_prefer_idle 1 - write /proc/vendor_sched/sys_uclamp_min 1024 + write /proc/vendor_sched/sys_uclamp_min 159 write /proc/vendor_sched/sys_prefer_idle 1 # governor setting -- cgit v1.2.3 From 03df275b4551e846f6867977a8e65ffab009f909 Mon Sep 17 00:00:00 2001 From: Luis Delgado de Mendoza Garcia Date: Mon, 24 Apr 2023 16:40:28 -0700 Subject: Add chre dedicated channel and start using them in chre_daemon. Adding the necessary entries to ueventd for gs201 and newer and enable the flag for chre_daemon to start using the channel. Bug: 241960170 Test: in-device verification. Change-Id: Ie53e3c21e6c83f9e184d31fd189cff3e5602bb2b --- conf/ueventd.gs201.rc | 4 ++++ device.mk | 1 + 2 files changed, 5 insertions(+) diff --git a/conf/ueventd.gs201.rc b/conf/ueventd.gs201.rc index b545d6a..44ec74c 100644 --- a/conf/ueventd.gs201.rc +++ b/conf/ueventd.gs201.rc @@ -151,6 +151,10 @@ /dev/acd-com.google.usf 0660 system system /dev/acd-com.google.usf.non_wake_up 0660 system system +# CHRE +/dev/acd-com.google.chre 0660 system system +/dev/acd-com.google.chre.non_wake_up 0660 system system + # LWIS /dev/lwis* 0660 system system diff --git a/device.mk b/device.mk index 30e3325..01a1947 100644 --- a/device.mk +++ b/device.mk @@ -373,6 +373,7 @@ PRODUCT_COPY_FILES += \ ## Enable the CHRE Daemon CHRE_USF_DAEMON_ENABLED := true +CHRE_DEDICATED_TRANSPORT_CHANNEL_ENABLED := true PRODUCT_PACKAGES += \ chre \ preloaded_nanoapps.json -- cgit v1.2.3 From 1d66ee690b2c768a51231ab6f56e91a486476f59 Mon Sep 17 00:00:00 2001 From: ChengYou Ho Date: Thu, 29 Jun 2023 22:03:43 +0000 Subject: device.mk: add misc_writer Bug: 285803498 Bug: 271950369 Change-Id: I4974f32fe49d218f7954568db4c585896b29f4f4 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 30e3325..f43cede 100644 --- a/device.mk +++ b/device.mk @@ -33,6 +33,7 @@ include device/google/gs-common/umfw_stat/umfw_stat.mk include device/google/gs-common/gear/dumpstate/aidl.mk include device/google/gs-common/widevine/widevine.mk include device/google/gs-common/sota_app/factoryota.mk +include device/google/gs-common/misc_writer/misc_writer.mk TARGET_BOARD_PLATFORM := gs201 -- cgit v1.2.3 From f77e84ac9870da76ccd93a1bef05dc2f28f931ed Mon Sep 17 00:00:00 2001 From: Patty Huang Date: Wed, 28 Jun 2023 22:34:15 +0800 Subject: bt: make bluetooth own the data vendor bluetooth folder permission Bug:289055382 Test: enable vendor debug log and check the vendor snoop log contain the vendor log Change-Id: If3e247093deae5b9d5c237dc585973e77a0629b1 --- conf/init.gs201.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index 00e91c6..61fa6b7 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -921,6 +921,7 @@ on post-fs-data chown bluetooth system /proc/bluetooth/sleep/btwake chown bluetooth system /proc/bluetooth/sleep/lpm chown bluetooth system /proc/bluetooth/sleep/btwrite + mkdir /data/vendor/bluetooth 0770 bluetooth system on post-fs-data mkdir /data/vendor/powerstats 0771 system system -- cgit v1.2.3 From 05ec1a52e6f7fa3d8be3eddb0af304d4bed196ab Mon Sep 17 00:00:00 2001 From: Nicole Lee Date: Tue, 4 Jul 2023 06:34:33 +0000 Subject: Update pixel stability logging mask - Update format to align p23 radio codebase - Enable UHAL_COMMON, UHAL_MISC, UHAL_SLEEP Bug: 289694702 Change-Id: Ida0eae486d0de3f14f85aec1edb209d56129a4c5 --- radio/config/Pixel_stability.nprf | Bin 8849 -> 9410 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/radio/config/Pixel_stability.nprf b/radio/config/Pixel_stability.nprf index 53b27a8..fb56509 100644 Binary files a/radio/config/Pixel_stability.nprf and b/radio/config/Pixel_stability.nprf differ -- cgit v1.2.3 From ac5dd11596c079dd8bc81a78ab05bd948e1032e6 Mon Sep 17 00:00:00 2001 From: Sebastian Pickl Date: Wed, 5 Jul 2023 09:45:56 +0000 Subject: Revert "bt: make bluetooth own the data vendor bluetooth folder ..." Revert submission 23844270-P22-vendor-log-udc-qpr Reason for revert: causes selinux tests to fail b/289989584 go/abtd: https://android-build.googleplex.com/builds/abtd/run/L37600000961782595 Bug:289989584 Reverted changes: /q/submissionid:23844270-P22-vendor-log-udc-qpr Change-Id: Ife1c71257572101c32b9e6f60c275b9366c654b2 --- conf/init.gs201.rc | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index 61fa6b7..00e91c6 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -921,7 +921,6 @@ on post-fs-data chown bluetooth system /proc/bluetooth/sleep/btwake chown bluetooth system /proc/bluetooth/sleep/lpm chown bluetooth system /proc/bluetooth/sleep/btwrite - mkdir /data/vendor/bluetooth 0770 bluetooth system on post-fs-data mkdir /data/vendor/powerstats 0771 system system -- cgit v1.2.3 From 0e178ea21013c3be1fdc4a1b9987be70f58bbb28 Mon Sep 17 00:00:00 2001 From: Randall Huang Date: Thu, 6 Jul 2023 14:21:32 +0800 Subject: fstab: add the noatime for read-only ext4 partitions This is to avoid unnecessary ext4 behavior Bug: 289631992 Test: boot to home Change-Id: I44f9632cc7b848d6fe673232be014cef71355018 Signed-off-by: Randall Huang --- conf/fstab.gs201.in | 12 ++++++------ conf/fstab.modem | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/conf/fstab.gs201.in b/conf/fstab.gs201.in index 977266b..e1af3e8 100644 --- a/conf/fstab.gs201.in +++ b/conf/fstab.gs201.in @@ -4,12 +4,12 @@ # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK # # -system /system ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 -system_dlkm /system_dlkm ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 -system_ext /system_ext ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 -product /product ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 -vendor /vendor ext4 ro wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128 -vendor_dlkm /vendor_dlkm ext4 ro wait,slotselect,avb=vbmeta,logical,first_stage_mount +system /system ext4 noatime,ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +system_dlkm /system_dlkm ext4 noatime,ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +system_ext /system_ext ext4 noatime,ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +product /product ext4 noatime,ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +vendor /vendor ext4 noatime,ro wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128 +vendor_dlkm /vendor_dlkm ext4 noatime,ro wait,slotselect,avb=vbmeta,logical,first_stage_mount /dev/block/platform/14700000.ufs/by-name/boot /boot emmc defaults slotselect,avb=boot,first_stage_mount /dev/block/platform/14700000.ufs/by-name/init_boot /init_boot emmc defaults slotselect,avb=init_boot,first_stage_mount /dev/block/platform/14700000.ufs/by-name/misc /misc emmc defaults wait diff --git a/conf/fstab.modem b/conf/fstab.modem index 7393362..760c916 100644 --- a/conf/fstab.modem +++ b/conf/fstab.modem @@ -4,5 +4,4 @@ /dev/block/platform/14700000.ufs/by-name/efs /mnt/vendor/efs f2fs noatime,sync wait,check,formattable /dev/block/platform/14700000.ufs/by-name/efs_backup /mnt/vendor/efs_backup f2fs noatime,sync wait,check,formattable /dev/block/platform/14700000.ufs/by-name/modem_userdata /mnt/vendor/modem_userdata f2fs noatime,sync wait,check,formattable -/dev/block/platform/14700000.ufs/by-name/modem /mnt/vendor/modem_img erofs ro,defaults,context=u:object_r:modem_img_file:s0 wait,slotselect -/dev/block/platform/14700000.ufs/by-name/modem /mnt/vendor/modem_img ext4 ro,defaults,context=u:object_r:modem_img_file:s0,barrier=1 wait,slotselect +/dev/block/platform/14700000.ufs/by-name/modem /mnt/vendor/modem_img ext4 noatime,ro,context=u:object_r:modem_img_file:s0 wait,slotselect -- cgit v1.2.3 From 78f6f8b59d0de3409f56c4957aa2b5f7dd2291b3 Mon Sep 17 00:00:00 2001 From: Avichal Rakesh Date: Mon, 12 Jun 2023 15:48:47 -0700 Subject: usb.rc: Remove write permissions from uvc specific files Files created by the uvc driver gives write permissions to 'other' by default. This permission is not needed at runtime. To minimize write privileges, this CL removes other-write permission from all uvc config files that had it. Bug: 242344229 Test: Manually verified that no files have other-write permissions Change-Id: I27611d0ba4ecf2851aef6ea8bd613284744142fb --- conf/init.gs201.usb.rc | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/conf/init.gs201.usb.rc b/conf/init.gs201.usb.rc index 78356df..79626ee 100644 --- a/conf/init.gs201.usb.rc +++ b/conf/init.gs201.usb.rc @@ -109,6 +109,31 @@ on early-boot symlink /config/usb_gadget/g1/functions/uvc.0/streaming/header/h /config/usb_gadget/g1/functions/uvc.0/streaming/class/fs/h symlink /config/usb_gadget/g1/functions/uvc.0/streaming/header/h /config/usb_gadget/g1/functions/uvc.0/streaming/class/hs/h symlink /config/usb_gadget/g1/functions/uvc.0/streaming/header/h /config/usb_gadget/g1/functions/uvc.0/streaming/class/ss/h + # remove write permissions for 'others' + chmod 664 /config/usb_gadget/g1/functions/uvc.0/control/header/h/bcdUVC + chmod 664 /config/usb_gadget/g1/functions/uvc.0/control/header/h/dwClockFrequency + chmod 664 /config/usb_gadget/g1/functions/uvc.0/function_name + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming_interval + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming_maxburst + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming_maxpacket + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/bmCapabilities + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/dwDefaultFrameInterval + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/dwFrameInterval + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/dwMaxBitRate + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/dwMaxVideoFrameBufferSize + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/dwMinBitRate + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/wHeight + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/wWidth + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/bmCapabilities + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/dwDefaultFrameInterval + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/dwFrameInterval + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/dwMaxBitRate + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/dwMaxVideoFrameBufferSize + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/dwMinBitRate + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/wHeight + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/wWidth + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/bDefaultFrameIndex + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/bmaControls # chown file/folder permission -- cgit v1.2.3 From 36494e4c4d2ba472733984727daf892fd7dad5da Mon Sep 17 00:00:00 2001 From: Hsiu-Chang Chen Date: Tue, 27 Jun 2023 12:00:55 +0800 Subject: wifi: convert WIFI_FEATURE_IMU_DETECTION to the equivalent soong variable Bug: 287607876 Test: SAR scenario is set properly with motion sensor status Change-Id: I4d0169f08a8aca4f516b775c63d36457c4ab96e2 --- wifi/qcom/BoardConfig-wifi.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wifi/qcom/BoardConfig-wifi.mk b/wifi/qcom/BoardConfig-wifi.mk index 6546ce4..4bd7210 100644 --- a/wifi/qcom/BoardConfig-wifi.mk +++ b/wifi/qcom/BoardConfig-wifi.mk @@ -48,4 +48,7 @@ PRODUCT_COPY_FILES += \ $(LOCAL_WIFI_PATH)/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf # Add BOARD_WLAN_CHIP to soong_config -$(call soong_config_set,qcom_wifi,board_wlan_chip,wcn6740) \ No newline at end of file +$(call soong_config_set,qcom_wifi,board_wlan_chip,wcn6740) + +# Add WIFI_FEATURE_IMU_DETECTION to soong_config +$(call soong_config_set,wifi,feature_imu_detection,$(WIFI_FEATURE_IMU_DETECTION)) -- cgit v1.2.3 From 34bb36163da144f0af6077a3baeb85d79d701b29 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Tue, 27 Jun 2023 16:58:24 -0700 Subject: Cancel boost on off-mode charger Test: Build Bug: 289120007 Change-Id: I753f9233600c1374f35de3eda0513451b602795a --- conf/init.gs201.rc | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index 00e91c6..2a79436 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -1021,6 +1021,29 @@ on charger mkdir /dev/thermal/cdev-by-name 0750 system system start vendor.thermal.symlinks + # Runtime fs tuning + write /sys/block/sda/queue/nr_requests 128 + write /sys/block/sda/queue/iostats 1 + write /sys/block/sda/queue/iosched/slice_idle 0 + write /dev/sys/fs/by-name/userdata/data_io_flag 8 + write /dev/sys/fs/by-name/userdata/node_io_flag 8 + + # Enable UFS powersaving + write /dev/sys/block/bootdevice/clkgate_enable 1 + + # 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 + + # Enable SICD + write /sys/devices/system/cpu/cpupm/cpupm/sicd 1 + on property:vendor.disable.bcl.control=1 write /sys/devices/virtual/pmic/mitigation/instruction/enable_mitigation 0 -- cgit v1.2.3 From 0964781a6c27c877c951f5c28cdbdcb3178d998a Mon Sep 17 00:00:00 2001 From: qinyiyan Date: Thu, 6 Jul 2023 16:53:05 -0700 Subject: Use version 1 of the DBA service, since version 1 is the only frozen version. bug:290377605 Change-Id: Ieec5b8b48c3567c940717df55a2e4582ef47d16c --- device_framework_matrix_product.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index aab556a..4cb1e41 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -102,7 +102,7 @@ com.google.edgetpu.dba - 2 + 1 IDevice default -- cgit v1.2.3 From 66a548d416e7461de1cd600be336f5d693ba4b9c Mon Sep 17 00:00:00 2001 From: qinyiyan Date: Thu, 6 Jul 2023 16:53:05 -0700 Subject: Use version 1 of the DBA service, since version 1 is the only frozen version. bug:289317242 Change-Id: Ieec5b8b48c3567c940717df55a2e4582ef47d16c Merged-In: Ieec5b8b48c3567c940717df55a2e4582ef47d16c --- device_framework_matrix_product.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 45f14ef..70b2274 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -102,7 +102,7 @@ com.google.edgetpu.dba - 2 + 1 IDevice default -- cgit v1.2.3 From 8990012f1d5923abc08226436bd2ef865b5ce3c4 Mon Sep 17 00:00:00 2001 From: samou Date: Mon, 26 Jun 2023 05:50:19 +0000 Subject: bcl: mask out clock divider for CPUCL1 Bug: 288238917 Change-Id: I330d966ee13539fcb46d54883d04b42152f6a58f Signed-off-by: samou --- conf/init.gs201.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index 2a79436..3127cc7 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -944,6 +944,7 @@ on property:vendor.brownout.mitigation.ready=1 write /sys/devices/virtual/pmic/mitigation/triggered_lvl/soft_ocp_cpu2_lvl 12000 write /sys/devices/virtual/pmic/mitigation/clock_div/tpu_clk_div 0x1 write /sys/devices/virtual/pmic/mitigation/clock_div/gpu_clk_div 0x1 + write /sys/devices/virtual/pmic/mitigation/clock_div/cpu1_clk_div 0x381 write /sys/devices/virtual/pmic/mitigation/clock_div/cpu2_clk_div 0x1 on property:vendor.thermal.link_ready=1 -- cgit v1.2.3 From 5c4cbe4023afd9a4380d8acd0249e6cd9c264310 Mon Sep 17 00:00:00 2001 From: Cody Northrop Date: Wed, 12 Jul 2023 11:20:16 -0600 Subject: EGL: Reduce multifile blobcache limit to 32MB Loading the larger limit is taking too long in the field for apps that are filling the cache. Test: Ran app until it exceeded cache, watched it reset to 50% Bug: 290249239 Change-Id: I1b80b8ad427d8a0d2a6d967b98b89d808c549527 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 0ba6d89..cab306b 100644 --- a/device.mk +++ b/device.mk @@ -270,7 +270,7 @@ endif # Configure EGL blobcache PRODUCT_VENDOR_PROPERTIES += \ ro.egl.blobcache.multifile=true \ - ro.egl.blobcache.multifile_limit=134217728 \ + ro.egl.blobcache.multifile_limit=33554432 \ PRODUCT_VENDOR_PROPERTIES += \ ro.opengles.version=196610 \ -- cgit v1.2.3 From c0baa17abe8b71fa1f9cf2a8add066c6911c8d28 Mon Sep 17 00:00:00 2001 From: Renato Grottesi Date: Thu, 13 Jul 2023 18:47:23 +0000 Subject: Remove settings for old ArmNN HIDL backend Compile ArmNN shim over the support library. Remove SELinux permissions and settings for the old HIDL backend. The AIDL settings will be in the gs-common folder. Test: Local run of CtsNNAPITestCases Test: Local run of VtsHalNeuralnetworksTargetTest Test: Local run of MLTS Benchmark Bug: 283724775 Merged-In: I3652eceb14d06a3e909444edc21ad86d9378bc6c Change-Id: If26928b13cdd9f3342026af95b9446f2918784fa --- BoardConfig-common.mk | 10 ---------- device.mk | 2 +- manifest-gralloc3.xml | 10 ---------- manifest.xml | 10 ---------- 4 files changed, 1 insertion(+), 31 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index f680441..723b6b6 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -352,16 +352,6 @@ BOARD_VNDK_VERSION := current # H/W align restriction of MM IPs BOARD_EXYNOS_S10B_FORMAT_ALIGN := 64 -# NeuralNetworks -GPU_SOURCE_PRESENT := $(wildcard vendor/arm/mali/valhall) -GPU_PREBUILD_PRESENT := $(wildcard vendor/google_devices/zebu/prebuilts/libs) -ifneq (,$(strip $(GPU_SOURCE_PRESENT) $(GPU_PREBUILD_PRESENT))) -ARMNN_COMPUTE_CL_ENABLE := 1 -else -ARMNN_COMPUTE_CL_ENABLE := 0 -endif -ARMNN_COMPUTE_NEON_ENABLE := 1 - # Boot.img BOARD_RAMDISK_USE_LZ4 := true #BOARD_KERNEL_BASE := 0x80000000 diff --git a/device.mk b/device.mk index 7752281..68fc2bc 100644 --- a/device.mk +++ b/device.mk @@ -225,7 +225,7 @@ PRODUCT_SOONG_NAMESPACES += \ $(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM)) -include device/google/gs101/neuralnetwork/neuralnetwork.mk +include device/google/gs-common/gpu/gpu.mk PRODUCT_PACKAGES += \ csffw_image_prebuilt__firmware_prebuilt_todx_mali_csffw.bin \ diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml index dc91529..0427aa5 100644 --- a/manifest-gralloc3.xml +++ b/manifest-gralloc3.xml @@ -82,16 +82,6 @@ default - - android.hardware.neuralnetworks - hwbinder - 1.3 - - IDevice - google-armnn - - @1.3::IDevice/google-armnn - android.hardware.neuralnetworks hwbinder diff --git a/manifest.xml b/manifest.xml index 90af32b..b6e6396 100644 --- a/manifest.xml +++ b/manifest.xml @@ -13,16 +13,6 @@ hwbinder @1.2::IBootControl/default - - android.hardware.neuralnetworks - hwbinder - 1.3 - - IDevice - google-armnn - - @1.3::IDevice/google-armnn - com.google.input.algos.spd -- cgit v1.2.3 From c011b953fff28ba44505658cad0c4a233b865533 Mon Sep 17 00:00:00 2001 From: Ilya Matyukhin Date: Thu, 6 Jul 2023 20:27:44 +0000 Subject: Bump IDebugManager version to 4 Bug: 278914238 Test: build Change-Id: I82bc2459776961a8a4d921aaecfa081dcbda6a00 --- device_framework_matrix_product.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 4cb1e41..8052335 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -82,7 +82,7 @@ com.google.face.debug - 3 + 4 IDebugHost default -- cgit v1.2.3 From 06b17a25e156773696fc54a4613a2f0c0bee6377 Mon Sep 17 00:00:00 2001 From: Akilesh Kailash Date: Sun, 16 Jul 2023 23:57:47 -0700 Subject: Use lz4 compression instead of gz. Given the benefits of lz4 with respect to install and merge times as well as reduce in CPU usage, it is worth to switch to lz4 Test: OTA Bug: 291594891 Signed-off-by: Akilesh Kailash (cherry picked from https://android-review.googlesource.com/q/commit:62afad0252b57c00847d4942504c6435105b8ccb) Merged-In: I0a6b164432e16f531c0cc1157814411960915539 Change-Id: I0a6b164432e16f531c0cc1157814411960915539 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index b304e0f..3265df5 100644 --- a/device.mk +++ b/device.mk @@ -589,7 +589,7 @@ include device/google/gs-common/battery_mitigation/bcl.mk $(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/android_t_baseline.mk) -PRODUCT_VIRTUAL_AB_COMPRESSION_METHOD := gz +PRODUCT_VIRTUAL_AB_COMPRESSION_METHOD := lz4 # Enforce generic ramdisk allow list $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk) -- cgit v1.2.3 From 5f0318b21f848461f018bc544f495fd4d05a8b07 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Tue, 25 Jul 2023 04:05:57 +0000 Subject: do not mount the debugfs on userdebug builds Bug: 278988913 Change-Id: I5c703310a4f82acf52fad87854682ca6e668d99b Signed-off-by: Robin Peng --- conf/init.debug.rc | 3 --- 1 file changed, 3 deletions(-) diff --git a/conf/init.debug.rc b/conf/init.debug.rc index d609d7e..d4de2c8 100644 --- a/conf/init.debug.rc +++ b/conf/init.debug.rc @@ -1,6 +1,3 @@ -on early-init - mount debugfs /sys/kernel/debug /sys/kernel/debug - # SJTAG on init chown system system /sys/devices/platform/sjtag_ap/interface/access_lvl -- cgit v1.2.3 From db1a72ccdb9101017ca0ee42c1fb49c12989cbec Mon Sep 17 00:00:00 2001 From: Ian Elliott Date: Wed, 28 Jun 2023 10:51:39 -0600 Subject: gs201: Enable SkiaVk as RenderEngine backend This changes RenderEngine from using the SkiaGL backend to using the SkiaVk backend. Bug: 290248072 Test: Manual testing Change-Id: I2e9c9fe01c84ad06116435567bb1b02b54677cef --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 3265df5..4ec8d11 100644 --- a/device.mk +++ b/device.mk @@ -277,7 +277,7 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \ ro.opengles.version=196610 \ graphics.gpu.profiler.support=true \ - debug.renderengine.backend=skiaglthreaded + debug.renderengine.backend=skiavkthreaded # GRAPHICS - GPU (end) # #################### -- cgit v1.2.3 From 6d975603e5a511f26c5229c67e79fe54c826a57f Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Wed, 12 Jul 2023 23:07:51 +0000 Subject: device FCM -= android.* Bug: 290408770 Test: N/A Change-Id: I6f85889399c989a9a65ab7e7178fd02f89e7847f --- device_framework_matrix_product.xml | 40 ------------------------------------- 1 file changed, 40 deletions(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 70b2274..d7b2406 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -1,44 +1,4 @@ - - android.hardware.contexthub - 1 - - IContextHub - default - - - - android.hardware.graphics.composer3 - 2 - - IComposer - default - - - - android.hardware.radio - 1.2 - - ISap - slot2 - - - - android.hardware.vibrator - 2 - - IVibrator - dual - - - - android.hardware.wifi.hostapd - 1 - - IHostapd - default - - android.vendor.samsung_slsi.telephony.hardware.radio 1.1 -- cgit v1.2.3 From 52301273fbb43b71acbcaed3b24ccbbd4bb795b5 Mon Sep 17 00:00:00 2001 From: Leo Chen Date: Fri, 21 Jul 2023 03:03:25 +0000 Subject: Update IDisplay to V9 Bug: 255986866 Bug: 227384721 Change-Id: I85d56f6a3a20f512f42923af95d77e25375c8fde --- device_framework_matrix_product.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 8052335..00d2cfe 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -110,7 +110,7 @@ com.google.hardware.pixel.display - 8 + 9 IDisplay default -- cgit v1.2.3 From e33182147a0f24ed5c9fb0e9e3f3a11c83720cdd Mon Sep 17 00:00:00 2001 From: Renato Grottesi Date: Tue, 8 Aug 2023 05:17:37 +0000 Subject: Disable armnn nnapi backend Discontinue maintenance and active support of ArmNN on Pixel phones. Bug: 294459623 Test: Local nnapi_info Merged-In: Ic0db64d2eec0cb955ae710fa0ac89de3d7136db6 Change-Id: Idfa020dc46070764ccfff148b1fdfc72ccd16442 --- device.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/device.mk b/device.mk index 68fc2bc..706e179 100644 --- a/device.mk +++ b/device.mk @@ -225,8 +225,6 @@ PRODUCT_SOONG_NAMESPACES += \ $(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 \ -- cgit v1.2.3 From f3dfb2dad7f4cdee4ec7ef170e63f249d3f2e1a1 Mon Sep 17 00:00:00 2001 From: Ziyi Cui Date: Thu, 11 May 2023 04:05:14 +0000 Subject: gs201: Add path reading for StormIRQ Bug: 279486693 Test: Verified the existence of atom and correctness of atom stats adb shell cmd stats print-logs && logcat -b all | grep -i 105043 Merged-In: Iae8f8de862c21e2b8e6b32618bc5971cbe98b1ca Change-Id: Iae8f8de862c21e2b8e6b32618bc5971cbe98b1ca Signed-off-by: Ziyi Cui (cherry picked from commit e9dab393fc378866f49f5533698e6e9b367ef3c2) --- pixelstats/pixelstats-vendor.gs201.rc | 3 ++- pixelstats/service.cpp | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pixelstats/pixelstats-vendor.gs201.rc b/pixelstats/pixelstats-vendor.gs201.rc index d324b6a..70d875e 100644 --- a/pixelstats/pixelstats-vendor.gs201.rc +++ b/pixelstats/pixelstats-vendor.gs201.rc @@ -1,6 +1,7 @@ on property:sys.boot_completed=1 start vendor.pixelstats_vendor - +on post-fs-data + chown system system /sys/kernel/metrics/irq/stats_reset service vendor.pixelstats_vendor /vendor/bin/pixelstats-vendor class hal user system diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp index d9f65e9..b7df808 100644 --- a/pixelstats/service.cpp +++ b/pixelstats/service.cpp @@ -80,6 +80,8 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = { }, .ResumeLatencyMetricsPath = "/sys/kernel/metrics/resume_latency/resume_latency_metrics", .LongIRQMetricsPath = "/sys/kernel/metrics/irq/long_irq_metrics", + .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" }; -- cgit v1.2.3 From 6ba21169aa04c17fc39225a25ce8ed02114cee7d Mon Sep 17 00:00:00 2001 From: Mark Chang Date: Wed, 26 Jul 2023 06:00:40 +0000 Subject: Remove IScreenProtectorDetectorService. Service not enabled on gs201 devices. Test: Failed tests no longer reported. Bug: 293555121 Change-Id: Iaaa21060c7c33d4e013d3d7c85065562a3f0c1ad Merged-In: Iaaa21060c7c33d4e013d3d7c85065562a3f0c1ad Signed-off-by: Mark Chang (cherry picked from commit 94e5bab69e1ac2da93d9df2eb26f02199d4a0e48) --- device_framework_matrix_product.xml | 7 ------- manifest-gralloc3.xml | 7 ------- manifest.xml | 7 ------- 3 files changed, 21 deletions(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 00d2cfe..9c24e13 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -116,13 +116,6 @@ default - - com.google.input.algos.spd - - IScreenProtectorDetectorService - default - - com.google.input 2 diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml index 0427aa5..fee0455 100644 --- a/manifest-gralloc3.xml +++ b/manifest-gralloc3.xml @@ -87,13 +87,6 @@ hwbinder @1.3::IDevice/google-edgetpu - - com.google.input.algos.spd - - IScreenProtectorDetectorService - default - - com.google.input 2 diff --git a/manifest.xml b/manifest.xml index b6e6396..031b46f 100644 --- a/manifest.xml +++ b/manifest.xml @@ -13,13 +13,6 @@ hwbinder @1.2::IBootControl/default - - com.google.input.algos.spd - - IScreenProtectorDetectorService - default - - com.google.input 2 -- cgit v1.2.3 From 6ea9de413c0c7c79b4dd3ba717f0da7232ac9bf4 Mon Sep 17 00:00:00 2001 From: Kelly Rossmoyer Date: Thu, 27 Jul 2023 22:06:17 +0000 Subject: suspend: enable adaptive suspend This CL adds build properties enabling Adaptive Suspend's short suspend backoff with a short suspend threshold of 2 seconds and a max backoff time of 40s. This is the same configuration that was deployed on the previous generation of devices. The plan is to monitor suspend behavior, screen-off uptime, wakeup rates, and the distribution of screen-off mA on these devices in comparison to those same attributes on late UDC builds, which will inform whether we ship or revert. Bug: 208947015 Test: booted with a test kernel and used alarmtimer mods to exercise high-frequency wakeup behavior Change-Id: Icf75c4dd705050833df5e48aaf0c28afa5754adb --- device.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 7df414b..1ff947a 100644 --- a/device.mk +++ b/device.mk @@ -1112,7 +1112,9 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Suspend properties PRODUCT_PROPERTY_OVERRIDES += \ - suspend.short_suspend_threshold_millis=2000 + suspend.short_suspend_threshold_millis=2000 \ + suspend.max_sleep_time_millis=40000 \ + suspend.short_suspend_backoff_enabled=true # Enable Incremental on the device PRODUCT_PROPERTY_OVERRIDES += \ -- cgit v1.2.3 From 11e675bb97788609a9b62932b5a8cff8fb0964ee Mon Sep 17 00:00:00 2001 From: Alec Mouri Date: Thu, 17 Aug 2023 21:45:30 +0000 Subject: Enable dimming in gamma space in screenshots for adaptive mode This fixes a flicker during screen rotation Bug: 293560925 Test: Youtube HDR playback (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:33171da4fbae416c9243dc6d036988418dd4f4fd) Merged-In: I30cc2373acc089bac066c731bdd48632a7a79da3 Change-Id: I30cc2373acc089bac066c731bdd48632a7a79da3 --- device.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 1ff947a..1fd1ef5 100644 --- a/device.mk +++ b/device.mk @@ -658,7 +658,8 @@ endif PRODUCT_PROPERTY_OVERRIDES += \ debug.sf.disable_backpressure=0 \ debug.sf.enable_gl_backpressure=1 \ - debug.sf.enable_sdr_dimming=1 + debug.sf.enable_sdr_dimming=1 \ + debug.sf.dim_in_gamma_in_enhanced_screenshots=1 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.use_phase_offsets_as_durations=1 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.late.sf.duration=10500000 -- cgit v1.2.3 From 9f82f3b25193ccf7156d105907b98c5b82734525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Fri, 25 Aug 2023 02:52:20 +0000 Subject: Set USF SoC from board makefile. Bug: 296943650 Test: presubmit Change-Id: I020eec4f355b4977ff1194a7f146f814874aeb55 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 1fd1ef5..822fb2b 100644 --- a/device.mk +++ b/device.mk @@ -983,6 +983,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) #$(call inherit-product-if-exists, vendor/google_devices/common/exynos-vendor.mk) #$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4375/device-bcm.mk) include device/google/gs-common/sensors/sensors.mk +$(call soong_config_set,usf,target_soc,gs201) PRODUCT_COPY_FILES += \ device/google/gs201/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \ -- cgit v1.2.3 From 4369c3083d26971a6b3a36286c6b78f623314184 Mon Sep 17 00:00:00 2001 From: Wilson Wu Date: Tue, 15 Aug 2023 04:21:19 +0000 Subject: Support variable refresh rate when typing on gs201 Enable config_variableRefreshRateTypingSupported for gs201 devices. Bug: 283055450 Test: build Change-Id: I88757928225224f492365dc8cb85cc7fce01036b --- overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 1f1bcea..f37aab5 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -289,4 +289,7 @@ "com.shannon.imsservice" "com.android.phone" + + + true -- cgit v1.2.3 From 7b31924b74156185673316e2ca009e280ced1e1b Mon Sep 17 00:00:00 2001 From: Arthur Hung Date: Tue, 15 Aug 2023 01:38:54 +0000 Subject: Enable small dirty detection for variable refresh rate Bug: 283055450 Test: Build Change-Id: I670432d6e566260df3cfdc938f4ddbae70b5d47a --- device.mk | 3 +++ overlay/frameworks/base/core/res/res/values/config.xml | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/device.mk b/device.mk index 822fb2b..38ae685 100644 --- a/device.mk +++ b/device.mk @@ -693,6 +693,9 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_color_management=tr PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.protected_contents=true PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.display_update_imminent_timeout_ms=50 +# Enhance VRR detection +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.enable_small_dirty_detection=true + # force to blend in P3 mode PRODUCT_PROPERTY_OVERRIDES += \ persist.sys.sf.native_mode=2 \ diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index f37aab5..577c0bf 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -292,4 +292,17 @@ true + + + + + com.google.android.youtube:0.07 + com.spotify.music:0.05 + com.reddit.frontpage:0.07 + com.zhiliaoapp.musically:0.07 + com.bilibili.app.in:0.07 + com.twitter.android:0.07 + -- cgit v1.2.3 From 679cf27ac40fd411662faa481301dd7281eac225 Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Thu, 7 Sep 2023 11:09:08 +0000 Subject: Revert "Enable small dirty detection for variable refresh rate" Revert submission 24149209-enable-vrr-extension Reason for revert: Bug: 299131033 Reverted changes: /q/submissionid:24149209-enable-vrr-extension Change-Id: I1d21a42726ba36f7f21a56bbc28c40befa7a5270 --- device.mk | 3 --- overlay/frameworks/base/core/res/res/values/config.xml | 13 ------------- 2 files changed, 16 deletions(-) diff --git a/device.mk b/device.mk index 38ae685..822fb2b 100644 --- a/device.mk +++ b/device.mk @@ -693,9 +693,6 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_color_management=tr PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.protected_contents=true PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.display_update_imminent_timeout_ms=50 -# Enhance VRR detection -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.enable_small_dirty_detection=true - # force to blend in P3 mode PRODUCT_PROPERTY_OVERRIDES += \ persist.sys.sf.native_mode=2 \ diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 577c0bf..f37aab5 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -292,17 +292,4 @@ true - - - - - com.google.android.youtube:0.07 - com.spotify.music:0.05 - com.reddit.frontpage:0.07 - com.zhiliaoapp.musically:0.07 - com.bilibili.app.in:0.07 - com.twitter.android:0.07 - -- cgit v1.2.3 From c7b6ab33efe61f8358a278e969fbf24a9bb2b117 Mon Sep 17 00:00:00 2001 From: Bethany Barrientos Date: Tue, 5 Sep 2023 14:55:59 -0500 Subject: Grant default permissions to PCS for camera connectivity - android.permission.POST_NOTIFICATIONS - android.permission.BLUETOOTH_CONNECT - android.permission.BLUETOOTH_SCAN Test: Same as others in topc Bug: 287069860 Change-Id: I96d5bcc4847138db92f89933ba084af7a2648456 --- default-permissions.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/default-permissions.xml b/default-permissions.xml index baee102..a00707e 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -45,6 +45,9 @@ package="com.google.android.apps.camera.services"> + + + -- cgit v1.2.3 From f7a71debb70f90a7c332788f9d5e43ff96ad5e6b Mon Sep 17 00:00:00 2001 From: Martin Liu Date: Tue, 12 Sep 2023 15:49:21 +0800 Subject: gs201: tweak memory management - set lmkd's swap_free_low_percentage to 100 - decrease swappiness to 60 This tweak also aligns the policy with P23. Test: boots with correct settings Bug: 299975853 Change-Id: I623a7687ef692f8f7a5cc906e186edde294b30be Signed-off-by: Martin Liu --- conf/init.gs201.rc | 2 +- device.mk | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index 3127cc7..2f62f69 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -701,7 +701,7 @@ on property:sys.boot_completed=1 # Enable ZRAM on boot_complete swapon_all /vendor/etc/fstab.${ro.board.platform} - write /proc/sys/vm/swappiness 100 + write /proc/sys/vm/swappiness 60 # Adjust watermark level write /proc/sys/vm/watermark_scale_factor 200 diff --git a/device.mk b/device.mk index 822fb2b..55f576b 100644 --- a/device.mk +++ b/device.mk @@ -1162,6 +1162,10 @@ PRODUCT_COPY_FILES += \ # 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 -- cgit v1.2.3 From 4097af99771794bf77ca015944840c8e391ab447 Mon Sep 17 00:00:00 2001 From: Jerry Huang Date: Tue, 12 Sep 2023 07:39:10 +0000 Subject: gs201: update media_codecs_performance_c2.xml based on UQ1A.230911.001 Bug: 292555946 Test: run cts -m CtsMediaDecoderTestCases -t android.media.decoder.cts.VideoDecoderPerfTest Change-Id: If04aa80ed736db924f0da7765a8a37bb5ddc81e3 --- media_codecs_performance_c2.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml index 21381a9..13609f2 100644 --- a/media_codecs_performance_c2.xml +++ b/media_codecs_performance_c2.xml @@ -126,8 +126,7 @@ - - + @@ -138,8 +137,8 @@ - - + + -- cgit v1.2.3 From 57ade0e64c345daeee52e4c94478bfea0c1e39fe Mon Sep 17 00:00:00 2001 From: Hsiu-Chang Chen Date: Wed, 6 Sep 2023 23:39:29 +0800 Subject: wifi: Update p2p overlay config Align the p2p overlay config with other projects Bug: 273897565 Test: P2P enables on 5GHz channel when DUT connected to 2.4GHz Change-Id: I4e4dac3b1f2fa907dc7e57408f3744086a126860 --- wifi/qcom/p2p_supplicant_overlay.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/wifi/qcom/p2p_supplicant_overlay.conf b/wifi/qcom/p2p_supplicant_overlay.conf index 92021fd..171d013 100644 --- a/wifi/qcom/p2p_supplicant_overlay.conf +++ b/wifi/qcom/p2p_supplicant_overlay.conf @@ -1,3 +1,4 @@ disable_scan_offload=1 p2p_go_vht=1 +p2p_pref_chan=124:149, 115:36 p2p_6ghz_disable=1 -- cgit v1.2.3 From 1fd5db8246aa29df0469b06485db9713edd3a3be Mon Sep 17 00:00:00 2001 From: Leo Liou Date: Thu, 14 Sep 2023 12:39:36 +0800 Subject: gs201: ffu: add lifeC and activated date as condition Limit the following devices to accept ffu upgrade: - LifeC time < 10% - Activated date < 1 year Bug: 273305600 Test: run ffu process at local Change-Id: I9cc9298eeb7cd32f02a9577efb71bda0737f284d Signed-off-by: Leo Liou --- storage/ufs_firmware_update.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/storage/ufs_firmware_update.sh b/storage/ufs_firmware_update.sh index d118115..a5cabfb 100755 --- a/storage/ufs_firmware_update.sh +++ b/storage/ufs_firmware_update.sh @@ -6,13 +6,23 @@ ufs_dev="/dev/sys/block/bootdevice" fw_dir="/vendor/firmware" blk_dev="/dev/block/by-name/fips" +min_timestamp=$(date -d "2022-10-01" +%s) +epoch_1y=$(date -u -d "1971-01-01" +%s) vendor=$(cat ${ufs_dev}/vendor | tr -d "[:space:]") model=$(cat ${ufs_dev}/model | tr -d "[:space:]") rev=$(cat ${ufs_dev}/rev | tr -d "[:space:]") file=$(find ${fw_dir} -name "*${vendor}${model}${rev}*" | head -n 1) -if [ -n "$file" ]; then +lifec=$(cat ${ufs_dev}/health_descriptor/life_time_estimation_c | tr -d "[:space:]") +[ ! "$lifec" ] && lifec=0xff + +atime=$(ls -lu -d /data 2>&1 | awk '{print $6}') +timestamp=$(date -d "$atime" +%s) +(( $timestamp < $min_timestamp )) && timestamp=$min_timestamp +now=$(date +%s) + +if [ -n "$file" ] && (( $lifec < 0x0a )) && (( $timestamp + $epoch_1y >= $now )); then # The first 4KB block at fips partition has been occupied, and unused space begins from 4 KB # Refer to: go/pixel-mp-ffu-ota-1p dd if="$file" of=$blk_dev bs=4k seek=1 -- cgit v1.2.3 From e5cc14a4792d359171c2d47311b8514431154ccb Mon Sep 17 00:00:00 2001 From: Wilson Wu Date: Tue, 19 Sep 2023 06:09:26 +0000 Subject: Disable variable refresh rate when typing on gs201 Turn off config_variableRefreshRateTypingSupported on gs201. Bug: 299966467 Test: presubmit Change-Id: Idb98959749f365b7ed5f192a9f650b70a3840ae0 --- overlay/frameworks/base/core/res/res/values/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index f37aab5..3f1e2c1 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -291,5 +291,5 @@ - true + false -- cgit v1.2.3 From c7042d8b23b527b14f580d839a0a45b57ab26782 Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Mon, 11 Sep 2023 17:11:12 +0000 Subject: init.gs201.rc: Disable util-awareness There are some regressions reports. Disable them completely for now. Bug: 297496375 Change-Id: I6478931d73145a15471982738f0ff93eae5f2f07 Signed-off-by: Qais Yousef --- conf/init.gs201.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index 2f62f69..847c261 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -16,6 +16,8 @@ on init # Set teo as cpu idle governor write /sys/devices/system/cpu/cpuidle/current_governor teo + # Disable util-awareness + write /proc/vendor_sched/teo_util_threshold "1024 1024 1024" # Boot time fs tuning write /sys/block/sda/queue/iostats 0 -- cgit v1.2.3 From 3644ca07e87069fd2bed99f9f1fe13862ad43f62 Mon Sep 17 00:00:00 2001 From: Amit Sunil Dhamne Date: Tue, 12 Sep 2023 20:05:15 -0700 Subject: usb: Modify sdp enumeration timeout value in charger mode Write to /sys/class/typec/port<...>/device/update_sdp_enum_timeout to reduce SDP enumeration timeout value when device is in charger mode. This will enable faster detection of a DCP port. Test: Validate (in charger mode) that the sysfs attribute is 1 (meaning lower sdp timeout value is being used). Read dmesg to see print showing timeout value is 5000ms. Bug: 275687235 Change-Id: I1bc872911d7f1eab26e62fe6f12fba05608e0f83 Signed-off-by: Amit Sunil Dhamne --- conf/init.gs201.usb.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/init.gs201.usb.rc b/conf/init.gs201.usb.rc index 79626ee..a050c7d 100644 --- a/conf/init.gs201.usb.rc +++ b/conf/init.gs201.usb.rc @@ -350,6 +350,7 @@ on property:sys.usb.config=charger && property:sys.usb.configfs=1 write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "midi" symlink /config/usb_gadget/g1/functions/midi.gs5 /config/usb_gadget/g1/configs/b.1/f1 write /config/usb_gadget/g1/UDC ${sys.usb.controller} + write /sys/class/typec/port0/device/update_sdp_enum_timeout 0x1 setprop sys.usb.state ${sys.usb.config} on property:ro.bootmode=usbuwb -- cgit v1.2.3 From d8e2a02998fc1db9be00dab69a213378fb3caede Mon Sep 17 00:00:00 2001 From: Amit Sunil Dhamne Date: Tue, 12 Sep 2023 17:20:37 -0700 Subject: UsbGadget: Update SDP enum timeout when gadget is pulled up Indicate to the kernel that the usb gadget is pulled up by writing to `update_sdp_enum_timeout` sysfs node. Write to this node will inform the kernel that it can lower the SDP timeout alarm value which is used to detect an SDP port vs a DCP. Bug:275687235 Test: Check `update_sdp_enum_timeout` is written into after usb gadget is pulled up. Verify that the alarm timeout lowers. Change-Id: Id3ae7e7a20b236cec6604414a7f81860e868bdd0 Signed-off-by: Amit Sunil Dhamne --- usb/gadget/UsbGadget.cpp | 65 +++++++++++++++++++++------------ usb/gadget/UsbGadget.h | 4 ++ usb/usb/android.hardware.usb-service.rc | 20 ++++++++++ 3 files changed, 66 insertions(+), 23 deletions(-) diff --git a/usb/gadget/UsbGadget.cpp b/usb/gadget/UsbGadget.cpp index 5da4dd9..d3bd8f3 100644 --- a/usb/gadget/UsbGadget.cpp +++ b/usb/gadget/UsbGadget.cpp @@ -44,6 +44,30 @@ constexpr char kHsi2cPath[] = "/sys/devices/platform/10d60000.hsi2c"; constexpr char kI2CPath[] = "/sys/devices/platform/10d60000.hsi2c/i2c-"; constexpr char kAccessoryLimitCurrent[] = "i2c-max77759tcpc/usb_limit_accessory_current"; constexpr char kAccessoryLimitCurrentEnable[] = "i2c-max77759tcpc/usb_limit_accessory_enable"; +constexpr char kUpdateSdpEnumTimeout[] = "i2c-max77759tcpc/update_sdp_enum_timeout"; + +Status getI2cBusHelper(string *name) { + DIR *dp; + + dp = opendir(kHsi2cPath); + if (dp != NULL) { + struct dirent *ep; + + while ((ep = readdir(dp))) { + if (ep->d_type == DT_DIR) { + if (string::npos != string(ep->d_name).find("i2c-")) { + std::strtok(ep->d_name, "-"); + *name = std::strtok(NULL, "-"); + } + } + } + closedir(dp); + return Status::SUCCESS; + } + + ALOGE("Failed to open %s", kHsi2cPath); + return Status::ERROR; +} UsbGadget::UsbGadget() : mGadgetIrqPath("") { if (access(OS_DESC_PATH, R_OK) != 0) { @@ -97,6 +121,7 @@ Status UsbGadget::getUsbGadgetIrqPath() { void currentFunctionsAppliedCallback(bool functionsApplied, void *payload) { UsbGadget *gadget = (UsbGadget *)payload; gadget->mCurrentUsbFunctionsApplied = functionsApplied; + gadget->updateSdpEnumTimeout(); } ScopedAStatus UsbGadget::getCurrentUsbFunctions(const shared_ptr &callback, @@ -363,6 +388,22 @@ ScopedAStatus UsbGadget::reset(const shared_ptr &callback, return ScopedAStatus::ok(); } +void UsbGadget::updateSdpEnumTimeout() { + string i2c_node, update_sdp_enum_timeout_path; + + Status status = getI2cBusHelper(&i2c_node); + if (status != Status::SUCCESS) { + ALOGE("%s: Unable to locate i2c bus node", __func__); + } + + update_sdp_enum_timeout_path = kI2CPath + i2c_node + "/" + kUpdateSdpEnumTimeout; + if (!WriteStringToFile("1", update_sdp_enum_timeout_path)) { + ALOGE("%s: Unable to write to %s.", __func__, update_sdp_enum_timeout_path.c_str()); + } else { + ALOGI("%s: Updated SDP enumeration timeout value.", __func__); + } +} + Status UsbGadget::setupFunctions(long functions, const shared_ptr &callback, uint64_t timeout, int64_t in_transactionId) { @@ -421,6 +462,7 @@ Status UsbGadget::setupFunctions(long functions, mCurrentUsbFunctionsApplied = true; if (callback) callback->setCurrentUsbFunctionsCb(functions, Status::SUCCESS, in_transactionId); + updateSdpEnumTimeout(); return Status::SUCCESS; } @@ -445,29 +487,6 @@ Status UsbGadget::setupFunctions(long functions, return Status::SUCCESS; } -Status getI2cBusHelper(string *name) { - DIR *dp; - - dp = opendir(kHsi2cPath); - if (dp != NULL) { - struct dirent *ep; - - while ((ep = readdir(dp))) { - if (ep->d_type == DT_DIR) { - if (string::npos != string(ep->d_name).find("i2c-")) { - std::strtok(ep->d_name, "-"); - *name = std::strtok(NULL, "-"); - } - } - } - closedir(dp); - return Status::SUCCESS; - } - - ALOGE("Failed to open %s", kHsi2cPath); - return Status::ERROR; -} - ScopedAStatus UsbGadget::setCurrentUsbFunctions(long functions, const shared_ptr &callback, int64_t timeout, diff --git a/usb/gadget/UsbGadget.h b/usb/gadget/UsbGadget.h index 403f2cc..3433081 100644 --- a/usb/gadget/UsbGadget.h +++ b/usb/gadget/UsbGadget.h @@ -115,6 +115,10 @@ struct UsbGadget : public BnUsbGadget { ScopedAStatus setVidPid(const char *vid,const char *pid); + // Indicates to the kernel that the gadget service is ready and the kernel can + // set SDP timeout to a lower value. + void updateSdpEnumTimeout(); + private: Status tearDownGadget(); Status getUsbGadgetIrqPath(); diff --git a/usb/usb/android.hardware.usb-service.rc b/usb/usb/android.hardware.usb-service.rc index 818ffb0..d6ef15d 100644 --- a/usb/usb/android.hardware.usb-service.rc +++ b/usb/usb/android.hardware.usb-service.rc @@ -68,6 +68,16 @@ on post-fs chown root system /sys/devices/platform/10d60000.hsi2c/i2c-7/i2c-max77759tcpc/usb_limit_source_enable chown root system /sys/devices/platform/10d60000.hsi2c/i2c-8/i2c-max77759tcpc/usb_limit_source_enable chown root system /sys/devices/platform/10d60000.hsi2c/i2c-9/i2c-max77759tcpc/usb_limit_source_enable + chown root system /sys/devices/platform/10d60000.hsi2c/i2c-0/i2c-max77759tcpc/update_sdp_enum_timeout + chown root system /sys/devices/platform/10d60000.hsi2c/i2c-1/i2c-max77759tcpc/update_sdp_enum_timeout + chown root system /sys/devices/platform/10d60000.hsi2c/i2c-2/i2c-max77759tcpc/update_sdp_enum_timeout + chown root system /sys/devices/platform/10d60000.hsi2c/i2c-3/i2c-max77759tcpc/update_sdp_enum_timeout + chown root system /sys/devices/platform/10d60000.hsi2c/i2c-4/i2c-max77759tcpc/update_sdp_enum_timeout + chown root system /sys/devices/platform/10d60000.hsi2c/i2c-5/i2c-max77759tcpc/update_sdp_enum_timeout + chown root system /sys/devices/platform/10d60000.hsi2c/i2c-6/i2c-max77759tcpc/update_sdp_enum_timeout + chown root system /sys/devices/platform/10d60000.hsi2c/i2c-7/i2c-max77759tcpc/update_sdp_enum_timeout + chown root system /sys/devices/platform/10d60000.hsi2c/i2c-8/i2c-max77759tcpc/update_sdp_enum_timeout + chown root system /sys/devices/platform/10d60000.hsi2c/i2c-9/i2c-max77759tcpc/update_sdp_enum_timeout chmod 664 /sys/class/typec/port0/power_role chmod 664 /sys/class/typec/port0/data_role chmod 664 /sys/class/typec/port0/port_type @@ -131,3 +141,13 @@ on post-fs chmod 664 /sys/devices/platform/10d60000.hsi2c/i2c-7/i2c-max77759tcpc/usb_limit_source_enable chmod 664 /sys/devices/platform/10d60000.hsi2c/i2c-8/i2c-max77759tcpc/usb_limit_source_enable chmod 664 /sys/devices/platform/10d60000.hsi2c/i2c-9/i2c-max77759tcpc/usb_limit_source_enable + chmod 664 /sys/devices/platform/10d60000.hsi2c/i2c-0/i2c-max77759tcpc/update_sdp_enum_timeout + chmod 664 /sys/devices/platform/10d60000.hsi2c/i2c-1/i2c-max77759tcpc/update_sdp_enum_timeout + chmod 664 /sys/devices/platform/10d60000.hsi2c/i2c-2/i2c-max77759tcpc/update_sdp_enum_timeout + chmod 664 /sys/devices/platform/10d60000.hsi2c/i2c-3/i2c-max77759tcpc/update_sdp_enum_timeout + chmod 664 /sys/devices/platform/10d60000.hsi2c/i2c-4/i2c-max77759tcpc/update_sdp_enum_timeout + chmod 664 /sys/devices/platform/10d60000.hsi2c/i2c-5/i2c-max77759tcpc/update_sdp_enum_timeout + chmod 664 /sys/devices/platform/10d60000.hsi2c/i2c-6/i2c-max77759tcpc/update_sdp_enum_timeout + chmod 664 /sys/devices/platform/10d60000.hsi2c/i2c-7/i2c-max77759tcpc/update_sdp_enum_timeout + chmod 664 /sys/devices/platform/10d60000.hsi2c/i2c-8/i2c-max77759tcpc/update_sdp_enum_timeout + chmod 664 /sys/devices/platform/10d60000.hsi2c/i2c-9/i2c-max77759tcpc/update_sdp_enum_timeout -- cgit v1.2.3 From 45b53c05d0c130f23dac1efca687b2acbdb45168 Mon Sep 17 00:00:00 2001 From: Klines Jiang Date: Tue, 22 Aug 2023 03:07:36 +0000 Subject: [SELinux] Add gyotaku_app doamin to Pixel 2022. Bug: 296836878 Test: Local build and tested pass. Change-Id: I39a8aea20281f83f90657306b8de0233054cb60a Merged-In: I39a8aea20281f83f90657306b8de0233054cb60a --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 55f576b..c8697a3 100644 --- a/device.mk +++ b/device.mk @@ -34,6 +34,7 @@ include device/google/gs-common/gear/dumpstate/aidl.mk include device/google/gs-common/widevine/widevine.mk 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 TARGET_BOARD_PLATFORM := gs201 -- cgit v1.2.3 From f233bec505ca7c44aa199277b04a81138a1c024f Mon Sep 17 00:00:00 2001 From: Kuen-Han Tsai Date: Tue, 19 Sep 2023 19:31:16 +0800 Subject: Usb.cpp: Fix typos when unable to disable USB data If Usb.cpp cannot write a zero value to the USB_DATA_PATH file, display the message of "Not able to turn off usb connection notification". Test: refactoring CL. Existing tests still pass. Bug: 301016122 Change-Id: I8e0f485e74d10a0154e4cd78af9f5ef5a22d328f --- usb/usb/Usb.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index e4f0b35..0cbc98c 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -148,7 +148,7 @@ ScopedAStatus Usb::enableUsbData(const string& in_portName, bool in_enable, } if (!WriteStringToFile("0", USB_DATA_PATH)) { - ALOGE("Not able to turn on usb connection notification"); + ALOGE("Not able to turn off usb connection notification"); result = false; } } -- cgit v1.2.3 From cd00df2aeb0d26f90e6f4c7d5b05a548598a6be3 Mon Sep 17 00:00:00 2001 From: Avichal Rakesh Date: Tue, 19 Sep 2023 16:34:49 -0700 Subject: usb.rc: Advertise 360p and 480p support through UVC Many host applications expect and ask for lower resolution streams when streaming from a USB webcam. To support those applications, this CL adds support for 640x480 and 640x360 streams. Bug: 301170431 Test: Manually tested that the resolution is advertised and streamed. Change-Id: I0bb6e2073554de4e5ce8fe472dae6a77e69aeb54 --- conf/init.gs201.usb.rc | 61 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/conf/init.gs201.usb.rc b/conf/init.gs201.usb.rc index a050c7d..6a52fb0 100644 --- a/conf/init.gs201.usb.rc +++ b/conf/init.gs201.usb.rc @@ -81,8 +81,28 @@ on early-boot mkdir /config/usb_gadget/g1/functions/uvc.0/control/header/h symlink /config/usb_gadget/g1/functions/uvc.0/control/header/h /config/usb_gadget/g1/functions/uvc.0/control/class/fs/h symlink /config/usb_gadget/g1/functions/uvc.0/control/header/h /config/usb_gadget/g1/functions/uvc.0/control/class/ss/h - # advertise 720p resolution for webcam encoded as mjpeg mkdir /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m + # advertise 360p resolution for webcam encoded as mjpeg + mkdir /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p + write /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p/wHeight 360 + write /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p/wWidth 640 + write /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p/dwMaxVideoFrameBufferSize 460800 + write /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p/dwDefaultFrameInterval 333333 + write /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p/dwFrameInterval "166666 +333333 +416666 +666666" + # advertise 480p resolution for webcam encoded as mjpeg + mkdir /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p + write /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p/wHeight 480 + write /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p/wWidth 640 + write /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p/dwMaxVideoFrameBufferSize 614400 + write /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p/dwDefaultFrameInterval 333333 + write /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p/dwFrameInterval "166666 +333333 +416666 +666666" + # advertise 720p resolution for webcam encoded as mjpeg mkdir /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p write /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/wHeight 720 write /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/wWidth 1280 @@ -112,6 +132,7 @@ on early-boot # remove write permissions for 'others' chmod 664 /config/usb_gadget/g1/functions/uvc.0/control/header/h/bcdUVC chmod 664 /config/usb_gadget/g1/functions/uvc.0/control/header/h/dwClockFrequency + chmod 664 /config/usb_gadget/g1/functions/uvc.0/control/terminal/output/default/bSourceID chmod 664 /config/usb_gadget/g1/functions/uvc.0/function_name chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming_interval chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming_maxburst @@ -124,6 +145,22 @@ on early-boot chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/dwMinBitRate chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/wHeight chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/wWidth + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p/bmCapabilities + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p/dwDefaultFrameInterval + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p/dwFrameInterval + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p/dwMaxBitRate + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p/dwMaxVideoFrameBufferSize + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p/dwMinBitRate + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p/wHeight + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p/wWidth + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p/bmCapabilities + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p/dwDefaultFrameInterval + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p/dwFrameInterval + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p/dwMaxBitRate + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p/dwMaxVideoFrameBufferSize + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p/dwMinBitRate + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p/wHeight + chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p/wWidth chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/bmCapabilities chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/dwDefaultFrameInterval chmod 664 /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/dwFrameInterval @@ -200,7 +237,7 @@ on early-boot chown system system /config/usb_gadget/g1/functions/rndis.gs4/protocol chown system system /config/usb_gadget/g1/functions/rndis.gs4/qmult chown system system /config/usb_gadget/g1/functions/rndis.gs4/subclass - chown system system /config/usb_gadget/g1/functions/uvc.0 + chown system system /config/usb_gadget/g1/functions/uvc.0/ chown system system /config/usb_gadget/g1/functions/uvc.0/control chown system system /config/usb_gadget/g1/functions/uvc.0/control/bInterfaceNumber chown system system /config/usb_gadget/g1/functions/uvc.0/control/class @@ -275,6 +312,26 @@ on early-boot chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/dwMinBitRate chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/wHeight chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/wWidth + chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p + chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p/bFrameIndex + chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p/bmCapabilities + chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p/dwDefaultFrameInterval + chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p/dwFrameInterval + chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p/dwMaxBitRate + chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p/dwMaxVideoFrameBufferSize + chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p/dwMinBitRate + chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p/wHeight + chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/360p/wWidth + chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p + chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p/bFrameIndex + chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p/bmCapabilities + chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p/dwDefaultFrameInterval + chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p/dwFrameInterval + chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p/dwMaxBitRate + chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p/dwMaxVideoFrameBufferSize + chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p/dwMinBitRate + chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p/wHeight + chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/480p/wWidth chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/bFrameIndex chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/bmCapabilities -- cgit v1.2.3 From ac76fcf02537c7cff32e658348754c74a7163fa1 Mon Sep 17 00:00:00 2001 From: Ian Elliott Date: Tue, 26 Sep 2023 15:03:28 +0000 Subject: Revert "gs201: Enable SkiaVk as RenderEngine backend" This reverts commit db1a72ccdb9101017ca0ee42c1fb49c12989cbec. Reason for revert: Increased jank reported, especially on the Pixel tablet Bug: 301846142 Bug: 298975477 Change-Id: I81726fdd164b48dc72756e35e4dadd755909cb91 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index c8697a3..91364b0 100644 --- a/device.mk +++ b/device.mk @@ -276,7 +276,7 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \ ro.opengles.version=196610 \ graphics.gpu.profiler.support=true \ - debug.renderengine.backend=skiavkthreaded + debug.renderengine.backend=skiaglthreaded # GRAPHICS - GPU (end) # #################### -- cgit v1.2.3 From fbfc56b8aaaaa4c19847c07affb7f111ce985834 Mon Sep 17 00:00:00 2001 From: Paul Lawrence Date: Tue, 24 Oct 2023 07:59:40 -0700 Subject: Run fsck to resolve possible data corruption Trigger fsck on mount of /data if the value of ro.preventative_fsck is not equal to the contents of /metadata/vold/preventative_fsck, then set the file to the property to prevent future runs See b/305658663 for context Bug: 305658663 Test: Make sure fsck run after first boot and not after second (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e4a81c0e8f9f8d89f0e42e8fd7ec40cec6b887ed) Merged-In: I1263d2d55fe22d994ae8c8654b1e75ad9e4ddafe Change-Id: I1263d2d55fe22d994ae8c8654b1e75ad9e4ddafe --- device-common.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device-common.mk b/device-common.mk index 5e3c511..bfd64ab 100644 --- a/device-common.mk +++ b/device-common.mk @@ -48,3 +48,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Set thermal warm reset PRODUCT_PRODUCT_PROPERTIES += \ ro.thermal_warmreset = true + +# Trigger fsck on upgrade (305658663) +PRODUCT_PRODUCT_PROPERTIES += \ + ro.preventative_fsck = 1 \ No newline at end of file -- cgit v1.2.3 From a9ba6b344f4b6eb971f8ad1ef0e0e1f7a08f321b Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Wed, 18 Oct 2023 12:21:14 -0700 Subject: fstab: allow unlocked devices to boot with AVB test key Set `avb_keys=no_such_key` for dynamic kernel partitions to allow booting unlocked devices with a custom kernel. This allows a few things: 1) Dogfooders can flash a custom kernel without wiping their device. This can help developers track down hard-to-reproduce bugs without rolling out a patch to the whole dogfooder population. 2) Developers can uprev their device's kernel without wiping their device or packaging the kernel with an Android platform build. Note: we are using "no_such_key" to ensure an AVB keys file doesn't accidentally get created. Test: Flash CI build. Then flash custom kernel on top. Bug: 274825778 Change-Id: I11edf6e50411a05c6723f7523f3672a9a8116d7a --- conf/fstab.gs201.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/fstab.gs201.in b/conf/fstab.gs201.in index e1af3e8..3a34987 100644 --- a/conf/fstab.gs201.in +++ b/conf/fstab.gs201.in @@ -5,11 +5,11 @@ # # system /system ext4 noatime,ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 -system_dlkm /system_dlkm ext4 noatime,ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +system_dlkm /system_dlkm ext4 noatime,ro wait,slotselect,avb=vbmeta_system,avb_keys=no_such_key,logical,first_stage_mount,readahead_size_kb=128 system_ext /system_ext ext4 noatime,ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 product /product ext4 noatime,ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 vendor /vendor ext4 noatime,ro wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128 -vendor_dlkm /vendor_dlkm ext4 noatime,ro wait,slotselect,avb=vbmeta,logical,first_stage_mount +vendor_dlkm /vendor_dlkm ext4 noatime,ro wait,slotselect,avb=vbmeta,avb_keys=no_such_key,logical,first_stage_mount /dev/block/platform/14700000.ufs/by-name/boot /boot emmc defaults slotselect,avb=boot,first_stage_mount /dev/block/platform/14700000.ufs/by-name/init_boot /init_boot emmc defaults slotselect,avb=init_boot,first_stage_mount /dev/block/platform/14700000.ufs/by-name/misc /misc emmc defaults wait -- cgit v1.2.3