gs101: Initialize for Evolution X 9.x

Signed-off-by: AnierinB <anierin@evolution-x.org>

Android.mk

@@ -0,0 +1,37 @@
+#
+# Copyright (C) 2011 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.
+#
+
+# WARNING: Everything listed here will be built on ALL platforms,
+# including x86, the universal, and the SDK.  Modules must be uniquely
+# named (liblights.panda), and must build everywhere, or limit themselves
+# to only building on ARM if they include assembly. Individual makefiles
+# are responsible for having their own logic, for fine-grained control.
+
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,default-permissions.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,libnfc-nci.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,fstab.postinstall,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,ueventd.rc,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,wpa_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,hals.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,media_profiles_V1_0.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,media_codecs_performance.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,device_state_configuration.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,task_profiles.json,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,p2p_supplicant_overlay.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,wpa_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,wpa_supplicant_overlay.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+
+$(eval $(call declare-1p-copy-files,device/google/gs101,audio_policy_configuration.xml))

BoardConfig-common.mk

@@ -16,18 +16,21 @@
 include build/make/target/board/BoardConfigMainlineCommon.mk
 include build/make/target/board/BoardConfigPixelCommon.mk
 
+# Should be uncommented after fixing vndk-sp violation is fixed.
+PRODUCT_FULL_TREBLE_OVERRIDE := true
+
 # HACK : To fix up after bring up multimedia devices.
 TARGET_SOC := gs101
 
 TARGET_SOC_NAME := google
 
 USES_DEVICE_GOOGLE_GS101 := true
-$(call soong_config_set,CitadelProvision,target_soc,gs101)
 
 TARGET_ARCH := arm64
 TARGET_ARCH_VARIANT := armv8-2a
 TARGET_CPU_ABI := arm64-v8a
 TARGET_CPU_VARIANT := cortex-a55
+TARGET_CPU_VARIANT_RUNTIME := cortex-a55
 
 DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false)
 
@@ -43,9 +46,7 @@ endif
 BOARD_KERNEL_CMDLINE += dyndbg=\"func alloc_contig_dump_pages +p\"
 BOARD_KERNEL_CMDLINE += earlycon=exynos4210,0x10A00000 console=ttySAC0,115200 androidboot.console=ttySAC0 printk.devkmsg=on
 BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y
-BOARD_KERNEL_CMDLINE += rcupdate.rcu_expedited=1 rcu_nocbs=all rcutree.enable_rcu_lazy
 BOARD_KERNEL_CMDLINE += swiotlb=noforce
-BOARD_KERNEL_CMDLINE += cgroup.memory=nokmem
 BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs
 
 TARGET_NO_BOOTLOADER := true
@@ -69,7 +70,7 @@ TARGET_RECOVERY_FSTAB_GENRULE = gen_fstab.gs101
 TARGET_RECOVERY_PIXEL_FORMAT := ABGR_8888
 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165
 TARGET_RECOVERY_UI_LIB := \
-	//hardware/google/pixel/recovery:librecovery_ui_pixel \
+	librecovery_ui_pixel \
 	libfstab
 
 AB_OTA_UPDATER := true
@@ -172,16 +173,7 @@ BOARD_SUPPORT_MFC_ENC_RGB := true
 BOARD_USE_BLOB_ALLOCATOR := false
 BOARD_SUPPORT_MFC_ENC_BT2020 := true
 BOARD_SUPPORT_FLEXIBLE_P010 := true
-$(call soong_config_set,video_codec,target_soc_name,$(TARGET_SOC_NAME))
-$(call soong_config_set_bool,video_codec,board_use_codec2_hidl_1_2,$(BOARD_USE_CODEC2_HIDL_1_2))
-$(call soong_config_set_bool,video_codec,board_use_csc_filter,$(BOARD_USE_CSC_FILTER))
-$(call soong_config_set_bool,video_codec,board_use_dec_sw_csc,$(BOARD_USE_DEC_SW_CSC))
-$(call soong_config_set_bool,video_codec,board_use_enc_sw_csc,$(BOARD_USE_ENC_SW_CSC))
-$(call soong_config_set_bool,video_codec,board_support_mfc_enc_rgb,$(BOARD_SUPPORT_MFC_ENC_RGB))
-$(call soong_config_set_bool,video_codec,board_use_blob_allocator,$(BOARD_USE_BLOB_ALLOCATOR))
-$(call soong_config_set_bool,video_codec,board_support_mfc_enc_bt2020,$(BOARD_SUPPORT_MFC_ENC_BT2020))
-$(call soong_config_set_bool,video_codec,board_support_flexible_p010,$(BOARD_SUPPORT_FLEXIBLE_P010))
-$(call soong_config_set_bool,video_codec,board_use_codec2_aidl,$(if $(BOARD_USE_CODEC2_AIDL),true,false))
+
 ########################
 
 BOARD_SUPER_PARTITION_SIZE := 8531214336
@@ -195,8 +187,8 @@ BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := \
     vendor \
     vendor_dlkm
 
-# Set error limit to BOARD_SUPER_PARTITON_SIZE - 400MB
-BOARD_SUPER_PARTITION_ERROR_LIMIT := 8111783936
+# Set error limit to BOARD_SUPER_PARTITON_SIZE - 500MB
+BOARD_SUPER_PARTITION_ERROR_LIMIT := 8006926336
 
 # Testing related defines
 BOARD_PERFSETUP_SCRIPT := platform_testing/scripts/perf-setup/r4o6-setup.sh
@@ -250,8 +242,6 @@ BOARD_USES_EXYNOS_AFBC_FEATURE := true
 
 BOARD_LIBACRYL_DEFAULT_COMPOSITOR := fimg2d_gs101
 BOARD_LIBACRYL_G2D_HDR_PLUGIN := libacryl_hdr_plugin
-$(call soong_config_set,acryl,libacryl_g2d_hdr_plugin,//hardware/google/graphics/gs101/libacryl_plugins:libacryl_hdr_plugin)
-$(call soong_config_set,acryl,libacryl_c_include,hardware/google/graphics/$(TARGET_BOARD_PLATFORM)/libcap)
 
 # HWCServices
 BOARD_USES_HWC_SERVICES := true
@@ -369,16 +359,12 @@ BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.m
 BOARD_DO_NOT_STRIP_VENDOR_MODULES := true
 
 # Prebuilt kernel modules that are *not* listed in vendor_boot.modules.load
-BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES = fips140.ko
+BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES = fips140/fips140.ko
 BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_EXTRA = $(foreach k,$(BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES),$(if $(wildcard $(KERNEL_MODULE_DIR)/$(k)), $(k)))
+KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_EXTRA))
 
 # Kernel modules that are listed in vendor_boot.modules.load
-# Starting from 6.1, use modules.load instead. It lists modules for vendor ramdisk regardless of the partition name.
-ifneq ($(wildcard $(KERNEL_MODULE_DIR)/modules.load),)
-    BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/modules.load))
-else
-    BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_boot.modules.load))
-endif
+BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_boot.modules.load))
 ifndef BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE
 $(error vendor_boot.modules.load not found or empty)
 endif

BoardConfigEvolution.mk

@@ -4,6 +4,4 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-BUILD_BROKEN_DUP_RULES := true
-
 DISABLE_ARTIFACT_PATH_REQUIREMENTS := true

BoardConfigLineage.mk

@@ -1,9 +1,13 @@
 #
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# Copyright (C) 2021 The Calyx Institute
+#
 # SPDX-License-Identifier: Apache-2.0
 #
 
+# Lineage Health
+TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_DEADLINE := true
+TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_TOGGLE := false
+
 # Manifests
 DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += vendor/lineage/config/device_framework_matrix.xml
 DEVICE_MANIFEST_FILE += device/google/gs101/manifest_radio.xml

OWNERS

@@ -2,4 +2,4 @@ per-file powerhint.json = wvw@google.com,joaodias@google.com,jenhaochen@google.c
 per-file powerhint.json = wvw@google.com,joaodias@google.com,jenhaochen@google.com,rkganesh@google.com,jychen@google.com
 
 # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
-per-file *.mk,{**/,}Android.bp=file:device/google/gs-common:main:/MK_OWNERS
+per-file *.mk=file:device/google/gs-common:main:/OWNERS

conf/OWNERS

@@ -1,2 +0,0 @@
-# per-file for Pixel fstab
-per-file fstab.*=file:device/google/gs-common:main:/FSTAB_OWNERS

conf/init.gs101.rc

@@ -1,4 +1,3 @@
-import /vendor/etc/init/hw/init.gs101.storage.rc
 import /vendor/etc/init/hw/init.gs101.usb.rc
 import android.hardware.drm@1.2-service.widevine.rc
 import init.exynos.sensorhub.rc
@@ -16,6 +15,10 @@ on init
     # Disable util-awareness
     write /proc/vendor_sched/teo_util_threshold "1024 1024 1024"
 
+    # Boot time fs tuning
+    write /sys/block/sda/queue/scheduler bfq
+    write /sys/block/sda/queue/iosched/slice_idle 0
+
     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
@@ -44,8 +47,6 @@ on init
     chown system system /proc/vendor_sched/prefer_idle_clear
     chown system system /proc/vendor_sched/pmu_poll_enable
     chown system system /proc/vendor_sched/pmu_poll_time
-    chown system system /proc/vendor_sched/uclamp_fork_reset_clear
-    chown system system /proc/vendor_sched/uclamp_fork_reset_set
     chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold
     chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold
     chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency
@@ -93,90 +94,11 @@ on init
     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 0660 /proc/vendor_sched/pmu_poll_enable
+    chmod 0220 /proc/vendor_sched/pmu_poll_enable
     chmod 0220 /proc/vendor_sched/pmu_poll_time
-    chmod 0220 /proc/vendor_sched/uclamp_fork_reset_clear
-    chmod 0220 /proc/vendor_sched/uclamp_fork_reset_set
 
     start vendor.keymaster-3-0
 
-    # Change permission of sched qos nodes
-    chown system system /proc/vendor_sched/sched_qos/adpf_set
-    chown system system /proc/vendor_sched/sched_qos/adpf_clear
-    chown system system /proc/vendor_sched/sched_qos/auto_uclamp_max_set
-    chown system system /proc/vendor_sched/sched_qos/auto_uclamp_max_clear
-    chown system system /proc/vendor_sched/sched_qos/boost_prio_set
-    chown system system /proc/vendor_sched/sched_qos/boost_prio_clear
-    chown system system /proc/vendor_sched/sched_qos/preempt_wakeup_set
-    chown system system /proc/vendor_sched/sched_qos/preempt_wakeup_clear
-    chown system system /proc/vendor_sched/sched_qos/prefer_fit_set
-    chown system system /proc/vendor_sched/sched_qos/prefer_fit_clear
-    chown system system /proc/vendor_sched/sched_qos/prefer_high_cap_set
-    chown system system /proc/vendor_sched/sched_qos/prefer_high_cap_clear
-    chown system system /proc/vendor_sched/sched_qos/prefer_idle_set
-    chown system system /proc/vendor_sched/sched_qos/prefer_idle_clear
-    chown system system /proc/vendor_sched/sched_qos/rampup_multiplier_set
-    chown system system /proc/vendor_sched/sched_qos/rampup_multiplier_clear
-
-    chmod 0220 /proc/vendor_sched/sched_qos/adpf_set
-    chmod 0220 /proc/vendor_sched/sched_qos/adpf_clear
-    chmod 0220 /proc/vendor_sched/sched_qos/auto_uclamp_max_set
-    chmod 0220 /proc/vendor_sched/sched_qos/auto_uclamp_max_clear
-    chmod 0220 /proc/vendor_sched/sched_qos/boost_prio_set
-    chmod 0220 /proc/vendor_sched/sched_qos/boost_prio_clear
-    chmod 0220 /proc/vendor_sched/sched_qos/preempt_wakeup_set
-    chmod 0220 /proc/vendor_sched/sched_qos/preempt_wakeup_clear
-    chmod 0220 /proc/vendor_sched/sched_qos/prefer_fit_set
-    chmod 0220 /proc/vendor_sched/sched_qos/prefer_fit_clear
-    chmod 0220 /proc/vendor_sched/sched_qos/prefer_high_cap_set
-    chmod 0220 /proc/vendor_sched/sched_qos/prefer_high_cap_clear
-    chmod 0220 /proc/vendor_sched/sched_qos/prefer_idle_set
-    chmod 0220 /proc/vendor_sched/sched_qos/prefer_idle_clear
-    chmod 0220 /proc/vendor_sched/sched_qos/rampup_multiplier_set
-    chmod 0220 /proc/vendor_sched/sched_qos/rampup_multiplier_clear
-
-    # Enable sched_qos for some groups
-    write /proc/vendor_sched/groups/ta/qos_adpf_enable 1
-    write /proc/vendor_sched/groups/ta/qos_auto_uclamp_max_enable 1
-    write /proc/vendor_sched/groups/ta/qos_boost_prio_enable 1
-    write /proc/vendor_sched/groups/ta/qos_preempt_wakeup_enable 1
-    write /proc/vendor_sched/groups/ta/qos_prefer_fit_enable 1
-    write /proc/vendor_sched/groups/ta/qos_prefer_high_cap_enable 1
-    write /proc/vendor_sched/groups/ta/qos_prefer_idle_enable 1
-    write /proc/vendor_sched/groups/ta/qos_rampup_multiplier_enable 1
-    write /proc/vendor_sched/groups/fg/qos_adpf_enable 1
-    write /proc/vendor_sched/groups/fg/qos_auto_uclamp_max_enable 1
-    write /proc/vendor_sched/groups/fg/qos_boost_prio_enable 1
-    write /proc/vendor_sched/groups/fg/qos_preempt_wakeup_enable 1
-    write /proc/vendor_sched/groups/fg/qos_prefer_fit_enable 1
-    write /proc/vendor_sched/groups/fg/qos_prefer_high_cap_enable 1
-    write /proc/vendor_sched/groups/fg/qos_prefer_idle_enable 1
-    write /proc/vendor_sched/groups/fg/qos_rampup_multiplier_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_adpf_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_auto_uclamp_max_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_boost_prio_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_preempt_wakeup_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_prefer_fit_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_prefer_high_cap_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_prefer_idle_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_rampup_multiplier_enable 1
-    write /proc/vendor_sched/groups/cam/qos_adpf_enable 1
-    write /proc/vendor_sched/groups/cam/qos_auto_uclamp_max_enable 1
-    write /proc/vendor_sched/groups/cam/qos_prefer_fit_enable 1
-    write /proc/vendor_sched/groups/cam/qos_prefer_high_cap_enable 1
-    write /proc/vendor_sched/groups/cam/qos_prefer_idle_enable 1
-    write /proc/vendor_sched/groups/cam/qos_rampup_multiplier_enable 1
-    write /proc/vendor_sched/groups/cam_power/qos_adpf_enable 1
-    write /proc/vendor_sched/groups/cam_power/qos_auto_uclamp_max_enable 1
-    write /proc/vendor_sched/groups/cam_power/qos_prefer_fit_enable 1
-    write /proc/vendor_sched/groups/cam_power/qos_prefer_high_cap_enable 1
-    write /proc/vendor_sched/groups/cam_power/qos_prefer_idle_enable 1
-    write /proc/vendor_sched/groups/cam_power/qos_rampup_multiplier_enable 1
-    write /proc/vendor_sched/groups/rt/qos_adpf_enable 1
-    write /proc/vendor_sched/groups/rt/qos_rampup_multiplier_enable 1
-    write /proc/vendor_sched/groups/sf/qos_adpf_enable 1
-    write /proc/vendor_sched/groups/sf/qos_rampup_multiplier_enable 1
-
     # ZRAM setup
     write /sys/block/zram0/comp_algorithm lz77eh
     write /proc/sys/vm/page-cluster 0
@@ -215,6 +137,16 @@ on init
     write /sys/class/net/rmnet6/queues/rx-0/rps_cpus fe
     write /sys/class/net/rmnet7/queues/rx-0/rps_cpus fe
 
+    # Create UDS structure for base VR services.
+    mkdir /dev/socket/pdx 0775 system system
+    mkdir /dev/socket/pdx/system 0775 system system
+    mkdir /dev/socket/pdx/system/buffer_hub 0775 system system
+    mkdir /dev/socket/pdx/system/performance 0775 system system
+    mkdir /dev/socket/pdx/system/vr 0775 system system
+    mkdir /dev/socket/pdx/system/vr/display 0775 system system
+    mkdir /dev/socket/pdx/system/vr/pose 0775 system system
+    mkdir /dev/socket/pdx/system/vr/sensors 0775 system system
+
     # Boot time 183626384
     write /proc/vendor_sched/groups/ta/uclamp_min 201
     write /proc/vendor_sched/groups/ta/prefer_idle 1
@@ -226,11 +158,14 @@ on init
     # governor setting
     write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor sched_pixel
     write /sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/up_rate_limit_us 500
+    write /sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us 5000
     write /sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_scale_pow 2
     write /sys/devices/system/cpu/cpu4/cpufreq/scaling_governor sched_pixel
     write /sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/up_rate_limit_us 500
+    write /sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us 20000
     write /sys/devices/system/cpu/cpu6/cpufreq/scaling_governor sched_pixel
     write /sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/up_rate_limit_us 500
+    write /sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us 20000
 
     # memlat cpuidle awareness setting
     write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu0_memlat@17000010/memlat_cpuidle_state_aware 2
@@ -342,7 +277,6 @@ on init
     chown system system /sys/class/power_supply/wireless/device/version
     chown system system /sys/class/power_supply/wireless/device/features
     chown system system /sys/class/power_supply/wireless/device/authtype
-    chown system system /sys/class/power_supply/wireless/device/authtstart
 
     # Adaptive charge
     chown system system /sys/class/power_supply/battery/charge_deadline
@@ -436,11 +370,6 @@ on late-fs
     # Mount RW partitions which need run fsck
     mount_all --late
 
-on late-init
-    write /sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us 5000
-    write /sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us 20000
-    write /sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us 20000
-
 on post-fs-data
     # Log data folder
     mkdir /data/vendor 0771 radio system
@@ -459,7 +388,7 @@ on post-fs-data
     mkdir /data/vendor/radio/logs/always-on 777 system radio
 
     # Modem extended log folder
-    mkdir /data/vendor/radio/extended_logs 0771 radio system
+    mkdir /data/vendor/radio/extended_logs 0770 radio system
 
     # Modem MDS log folder
     mkdir /data/vendor/radio/mds 0771 radio system
@@ -496,8 +425,8 @@ on post-fs-data
     restorecon /sys/kernel/debug/tracing/trace_marker
 
     # ranging sensor
-    chown system system /dev/ispolin_ranging
-    chmod 0660 /dev/ispolin_ranging
+    chown system system /dev/stmvl53l1_ranging
+    chmod 0660 /dev/stmvl53l1_ranging
 
     # Factory calibration files
     chmod 0771 /mnt/vendor/persist/camera
@@ -773,12 +702,6 @@ on property:sys.boot_completed=1
     write /dev/cpuset/camera-daemon/cpus ${persist.device_config.vendor_system_native.camera-daemon_cpuset:-0-7}
     setprop vendor.powerhal.init 1
 
-    # Setup scheduler parameters
-    write /proc/vendor_sched/min_granularity_ns 1000000
-    write /proc/vendor_sched/latency_ns 8000000
-    write /proc/vendor_sched/max_load_balance_interval 1
-    write /proc/vendor_sched/enable_hrtick 1
-
     # Setup final cpu.uclamp
     write /proc/vendor_sched/groups/ta/uclamp_min 1
     write /proc/vendor_sched/groups/fg/uclamp_min 0
@@ -906,12 +829,10 @@ on property:ro.build.fingerprint=*
     write /sys/module/debug_kinfo/parameters/build_info ${ro.build.fingerprint}
 
 # Bluetooth
-on early-boot
+on post-fs-data
     chown bluetooth system /sys/devices/platform/175b0000.serial/serial0/serial0-0/bluetooth/hci0/rfkill0/state
     chown bluetooth system /sys/devices/platform/odm/odm:btbcm/rfkill/rfkill0/state
     chown bluetooth system /sys/devices/platform/odm/odm:btbcm/rfkill/rfkill2/state
-
-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
@@ -931,12 +852,50 @@ on property:vendor.thermal.link_ready=1
     write /sys/devices/virtual/pmic/mitigation/clock_ratio/gpu_heavy_clk_ratio 0xfff04385
     write /sys/devices/virtual/pmic/mitigation/clock_ratio/tpu_heavy_clk_ratio 0xfff041c1
     write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu2_heavy_clk_ratio 0xfff041c0
+    write /dev/thermal/tz-by-name/smpl_gm/policy user_space
+    write /dev/thermal/tz-by-name/vdroop1/policy user_space
+    write /dev/thermal/tz-by-name/vdroop2/policy user_space
+    write /dev/thermal/tz-by-name/ocp_cpu1/policy user_space
+    write /dev/thermal/tz-by-name/ocp_cpu2/policy user_space
+    write /dev/thermal/tz-by-name/ocp_tpu/policy user_space
+    write /dev/thermal/tz-by-name/ocp_gpu/policy user_space
+    write /dev/thermal/tz-by-name/soft_ocp_cpu1/policy user_space
+    write /dev/thermal/tz-by-name/soft_ocp_cpu2/policy user_space
+    write /dev/thermal/tz-by-name/soft_ocp_tpu/policy user_space
+    write /dev/thermal/tz-by-name/soft_ocp_gpu/policy user_space
+    write /dev/thermal/tz-by-name/soc/policy user_space
+    write /dev/thermal/tz-by-name/batoilo/policy user_space
     write /sys/devices/virtual/pmic/mitigation/triggered_lvl/smpl_lvl 3100
-    write /sys/devices/virtual/pmic/mitigation/triggered_lvl/ocp_cpu1_lvl 7000
-    write /sys/devices/virtual/pmic/mitigation/triggered_lvl/soft_ocp_cpu1_lvl 7000
     write /sys/devices/virtual/pmic/mitigation/clock_div/tpu_clk_div 0x1
     write /sys/devices/virtual/pmic/mitigation/clock_div/gpu_clk_div 0x1
     write /sys/devices/virtual/pmic/mitigation/clock_div/cpu2_clk_div 0x1
+    chown system system /dev/thermal/tz-by-name/soc/mode
+    chown system system /dev/thermal/tz-by-name/batoilo/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/batoilo/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/vdroop2/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/vdroop2/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/vdroop1/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/vdroop1/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/smpl_gm/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/smpl_gm/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/ocp_cpu1/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/ocp_cpu1/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/ocp_cpu2/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/ocp_cpu2/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/ocp_tpu/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/ocp_tpu/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/ocp_gpu/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/ocp_gpu/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/soft_ocp_cpu1/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/soft_ocp_cpu1/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/soft_ocp_cpu2/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/soft_ocp_cpu2/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/soft_ocp_tpu/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/soft_ocp_tpu/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/soft_ocp_gpu/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/soft_ocp_gpu/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/soc/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/soc/trip_point_0_hyst
     # Thermal
     chown system system /dev/thermal/tz-by-name/quiet_therm/trip_point_0_temp
     chown system system /dev/thermal/tz-by-name/quiet_therm/trip_point_0_hyst

conf/init.gs101.usb.rc

@@ -414,7 +414,3 @@ on property:vendor.usb.contaminantdisable=true
 
 on property:ro.bootmode=usbuwb
     setprop persist.vendor.usb.usbradio.config uwb_acm
-
-# WAR for kernel 5.10 with CONFIG_USB_DUMMY_HCD enabled
-on property:sys.usb.controller=dummy_udc.0
-    setprop sys.usb.controller "11110000.dwc3"

default-permissions.xml

@@ -55,6 +55,7 @@
         <!-- Camera -->
         <permission name="android.permission.CAMERA" fixed="false"/>
         <!-- Camera Connectivity -->
+        <permission name="android.permission.ACCESS_FINE_LOCATION" fixed="false"/>
         <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
         <permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/>
         <permission name="android.permission.BLUETOOTH_SCAN" fixed="false"/>
@@ -72,8 +73,6 @@
         <permission name="android.permission.ACTIVITY_RECOGNITION" fixed="false"/>
         <!-- Notifications -->
         <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
-        <!-- Used by Bluetooth Module to collect bluetooth info -->
-        <permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/>
     </exception>
 
     <exception
@@ -171,11 +170,4 @@
         <!-- Notifications -->
         <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
     </exception>
-
-    <exception package="com.google.android.apps.pixel.relationships">
-        <permission name="android.permission.CALL_PHONE" fixed="false"/>
-        <permission name="android.permission.READ_CALL_LOG" fixed="false"/>
-        <permission name="android.permission.READ_CONTACTS" fixed="false"/>
-        <permission name="android.permission.WRITE_CONTACTS" fixed="false"/>
-    </exception>
 </exceptions>

device.mk

@@ -16,7 +16,7 @@
 
 include device/google/gs-common/device.mk
 include device/google/gs-common/gs_watchdogd/watchdog.mk
-include device/google/gs-common/ramdump_and_coredump/ramdump_and_coredump.mk
+include device/google/gs-common/ramdump/ramdump.mk
 include device/google/gs-common/soc/soc.mk
 include device/google/gs-common/soc/freq.mk
 include device/google/gs-common/modem/modem.mk
@@ -25,7 +25,6 @@ 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/power/power.mk
 include device/google/gs-common/display/dump.mk
 include device/google/gs101/dumpstate/item.mk
 include device/google/gs-common/radio/dump.mk
@@ -37,11 +36,9 @@ 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
-include device/google/gs-common/betterbug/betterbug.mk
 ifneq ($(filter oriole raven bluejay, $(TARGET_PRODUCT)),)
   include device/google/gs-common/bcmbt/dump/dumplog.mk
 endif
-include device/google/gs-common/fingerprint/fingerprint.mk
 
 TARGET_BOARD_PLATFORM := gs101
 DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false)
@@ -76,6 +73,7 @@ PRODUCT_SOONG_NAMESPACES += \
 	vendor/google/whitechapel/tools \
 	vendor/google/camera \
 	vendor/google/interfaces \
+	vendor/google_devices/common/proprietary/confirmatioui_hal \
 	vendor/google_nos/host/android \
 	vendor/google_nos/test/system-test-harness
 
@@ -181,16 +179,9 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	telephony.active_modems.max_count=2
 
 USE_LASSEN_OEMHOOK := true
-# The "power-anomaly-sitril" is added into PRODUCT_SOONG_NAMESPACES when
-# $(USE_LASSEN_OEMHOOK) is true and $(BOARD_WITHOUT_RADIO) is not true.
-ifneq ($(BOARD_WITHOUT_RADIO),true)
-    PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril
-    $(call soong_config_set,sitril,use_lassen_oemhook_with_radio,true)
-endif
 
 # Use for GRIL
 USES_LASSEN_MODEM := true
-$(call soong_config_set, vendor_ril_google_feature, use_lassen_modem, true)
 
 ifeq ($(USES_GOOGLE_DIALER_CARRIER_SETTINGS),true)
 USE_GOOGLE_DIALER := true
@@ -210,27 +201,17 @@ USE_SWIFTSHADER := false
 TARGET_USES_VULKAN = true
 
 PRODUCT_SOONG_NAMESPACES += \
-	vendor/arm/mali/gs101
+	vendor/arm/mali/valhall
 
-# Used in gfx_tools when defining tests with composer2 interface for gs101 devices
-$(call soong_config_set,gfx_tools,use_hwc2,true)
+$(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM))
 
 include device/google/gs-common/gpu/gpu.mk
 PRODUCT_PACKAGES += \
 	libGLES_mali \
 	vulkan.mali \
+	libOpenCL \
 	libgpudataproducer
 
-# Install the OpenCL ICD Loader
-PRODUCT_SOONG_NAMESPACES += external/OpenCL-ICD-Loader
-PRODUCT_PACKAGES += \
-       libOpenCL \
-       mali_icd__customer_pixel_opencl-icd_ARM.icd
-ifeq ($(DEVICE_IS_64BIT_ONLY),false)
-PRODUCT_PACKAGES += \
-	mali_icd__customer_pixel_opencl-icd_ARM32.icd
-endif
-
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.hardware.vulkan=mali
 
@@ -241,7 +222,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 PRODUCT_VENDOR_PROPERTIES += \
 	vendor.mali.platform.config=/vendor/etc/mali/platform.config \
 	vendor.mali.debug.config=/vendor/etc/mali/debug.config \
-	vendor.mali.base_protected_max_core_count=4 \
+	vendor.mali.base_protected_max_core_count=3 \
 	vendor.mali.base_protected_tls_max=67108864 \
 	vendor.mali.platform_agt_frequency_khz=24576
 
@@ -257,8 +238,9 @@ PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.vulkan.version-1_3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \
 	frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \
 	frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute.xml \
-	frameworks/native/data/etc/android.software.vulkan.deqp.level-2024-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \
-	frameworks/native/data/etc/android.software.opengles.deqp.level-2024-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml
+	frameworks/native/data/etc/android.software.contextualsearch.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.contextualsearch.xml \
+	frameworks/native/data/etc/android.software.vulkan.deqp.level-2023-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \
+	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_VENDOR_PROPERTIES += \
@@ -287,7 +269,6 @@ PRODUCT_VENDOR_PROPERTIES += ro.surface_flinger.prime_shader_cache.ultrahdr=1
 DEVICE_MANIFEST_FILE := \
 	device/google/gs101/manifest$(LOCAL_64ONLY).xml
 
-BOARD_USE_CODEC2_AIDL := V1
 ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
 DEVICE_MANIFEST_FILE += \
 	device/google/gs101/manifest_media_aosp.xml
@@ -326,14 +307,6 @@ PRODUCT_COPY_FILES += \
 	device/google/gs101/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc
 endif
 
-ifneq (,$(filter 5.%, $(TARGET_LINUX_KERNEL_VERSION)))
-PRODUCT_COPY_FILES += \
-	device/google/gs101/storage/5.10/init.gs101.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs101.storage.rc
-else
-PRODUCT_COPY_FILES += \
-	device/google/gs101/storage/6.1/init.gs101.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs101.storage.rc
-endif
-
 # Recovery files
 PRODUCT_COPY_FILES += \
 	device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.gs101.rc
@@ -360,10 +333,6 @@ PRODUCT_COPY_FILES += \
 
 include device/google/gs-common/insmod/insmod.mk
 
-# Insmod config files
-PRODUCT_COPY_FILES += \
-	$(call find-copy-subdir-files,init.insmod.*.cfg,$(TARGET_KERNEL_DIR),$(TARGET_COPY_OUT_VENDOR_DLKM)/etc)
-
 # For creating dtbo image
 PRODUCT_HOST_PACKAGES += \
 	mkdtimg
@@ -539,6 +508,10 @@ PRODUCT_PACKAGES += \
 	com.android.future.usb.accessory
 
 # for now include gralloc here. should come from hardware/google_devices/exynos5
+PRODUCT_PACKAGES += \
+	android.hardware.graphics.mapper@4.0-impl \
+	android.hardware.graphics.allocator-V1-service
+
 PRODUCT_PACKAGES += \
 	android.hardware.memtrack-service.pixel \
 	libion_exynos \
@@ -570,11 +543,13 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
         ConnectivityOverlay
 
-PRODUCT_PACKAGES_ENG += \
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES_DEBUG += \
 	f2fs_io \
 	check_f2fs \
 	f2fs.fibmap \
 	dump.f2fs
+endif
 
 # Storage dump
 include device/google/gs-common/storage/storage.mk
@@ -583,9 +558,6 @@ include device/google/gs-common/storage/storage.mk
 PRODUCT_PACKAGES += \
 	android.hardware.health.storage-service.default
 
-# Battery Mitigation
-include device/google/gs-common/battery_mitigation/bcl.mk
-
 # storage pixelstats
 -include hardware/google/pixel/pixelstats/device.mk
 
@@ -762,25 +734,16 @@ PRODUCT_COPY_FILES += \
 	device/google/gs101/media_codecs_performance_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_c2.xml \
 
 PRODUCT_PROPERTY_OVERRIDES += \
+    debug.stagefright.c2-poolmask=458752 \
     debug.c2.use_dmabufheaps=1 \
     media.c2.dmabuf.padding=512 \
     debug.stagefright.ccodec_delayed_params=1 \
     ro.vendor.gpu.dataspace=1
 
-ifneq ($(BOARD_USE_CODEC2_AIDL), )
-PRODUCT_PROPERTY_OVERRIDES += \
-        debug.stagefright.c2-poolmask=1507328
-else
-PRODUCT_PROPERTY_OVERRIDES += \
-        debug.stagefright.c2-poolmask=458752
-endif
-
 # Create input surface on the framework side
 PRODUCT_PROPERTY_OVERRIDES += \
 	debug.stagefright.c2inputsurface=-1 \
 
-PRODUCT_PROPERTY_OVERRIDES += media.c2.hal.selection=aidl
-
 # 2. OpenMAX IL
 PRODUCT_COPY_FILES += \
 	device/google/gs101/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
@@ -832,9 +795,11 @@ $(call inherit-product, system/core/trusty/trusty-base.mk)
 include device/google/gs-common/trusty/trusty.mk
 
 # Trusty unit test tool
-PRODUCT_PACKAGES_ENG += \
-    trusty-ut-ctrl \
-    tipc-test
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES_DEBUG += trusty-ut-ctrl
+endif
+
+include device/google/gs101/confirmationui/confirmationui.mk
 
 include device/google/gs101/trusty_metricsd/trusty_metricsd.mk
 
@@ -857,10 +822,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
 	persist.bluetooth.bqr.min_interval_ms=500
 endif
 
-# Enable Bluetooth AutoOn feature
-PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.server.automatic_turn_on=true
-
 #VNDK
 PRODUCT_PACKAGES += \
 	vndk-libs
@@ -891,7 +852,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
 	Iwlan
 
-#Iwlan test app for eng builds
+#Iwlan test app for userdebug/eng builds
 ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES += \
 	IwlanTestApp
@@ -917,8 +878,10 @@ PRODUCT_PACKAGES += ShannonIms
 
 $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/shannon-iwlan/device-vendor.mk)
 
-PRODUCT_PACKAGES_ENG += \
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES_DEBUG += \
 	preinstalled-packages-product-gs101-device-debug.xml
+endif
 
 PRODUCT_PACKAGES += ShannonRcs
 endif
@@ -926,7 +889,6 @@ endif
 # Exynos RIL and telephony
 # Multi SIM(DSDS)
 SIM_COUNT := 2
-$(call soong_config_set,sim,sim_count,$(SIM_COUNT))
 SUPPORT_MULTI_SIM := true
 # Support NR
 SUPPORT_NR := true
@@ -958,6 +920,9 @@ PRODUCT_COPY_FILES += \
 	device/google/gs101/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \
 	device/google/gs101/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml
 
+# modem_svc_sit daemon
+PRODUCT_PACKAGES += modem_svc_sit
+
 # modem logging binary/configs
 PRODUCT_PACKAGES += modem_logging_control
 
@@ -986,11 +951,13 @@ PRODUCT_COPY_FILES += \
 	device/google/gs101/radio/gnss_blanking.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/gnss_blanking.csv
 
 # Vibrator Diag
-PRODUCT_PACKAGES_ENG += \
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES_DEBUG += \
 	diag-vibrator \
 	diag-vibrator-cs40l25a \
 	diag-vibrator-drv2624 \
 	$(NULL)
+endif
 
 PRODUCT_PACKAGES += \
 	android.hardware.health-service.gs101 \
@@ -1064,9 +1031,7 @@ PRODUCT_SOONG_NAMESPACES += \
 	vendor/google_devices/gs101/proprietary/gchips/tpu/darwinn_logging_service \
 	vendor/google_devices/gs101/proprietary/gchips/tpu/nnapi_stable_aidl \
 	vendor/google_devices/gs101/proprietary/gchips/tpu/aidl \
-	vendor/google_devices/gs101/proprietary/gchips/tpu/hal \
-	vendor/google_devices/gs101/proprietary/gchips/tpu/tachyon/tachyon_apis \
-	vendor/google_devices/gs101/proprietary/gchips/tpu/tachyon/service
+	vendor/google_devices/gs101/proprietary/gchips/tpu/hal
 # TPU firmware
 PRODUCT_PACKAGES += edgetpu-abrolhos.fw
 
@@ -1127,7 +1092,9 @@ endif
 include hardware/google/pixel/wifi_ext/device.mk
 
 # Battery Stats Viewer
-PRODUCT_PACKAGES_ENG += BatteryStatsViewer
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES_DEBUG += BatteryStatsViewer
+endif
 
 # Install product specific framework compatibility matrix
 # (TODO: b/169535506) This includes the FCM for system_ext and product partition.
@@ -1135,19 +1102,12 @@ PRODUCT_PACKAGES_ENG += BatteryStatsViewer
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product.xml
 
 # Preopt SystemUI
-ifneq ($(RELEASE_SYSTEMUI_USE_SPEED_PROFILE), true)
 PRODUCT_DEXPREOPT_SPEED_APPS += SystemUIGoogle  # For internal
-PRODUCT_DEXPREOPT_SPEED_APPS += SystemUI        # For AOSP
-endif
+PRODUCT_DEXPREOPT_SPEED_APPS += SystemUI  # For AOSP
 
-# Set on-device compilation mode for SystemUI.
-ifeq ($(RELEASE_SYSTEMUI_USE_SPEED_PROFILE), true)
-PRODUCT_PROPERTY_OVERRIDES += \
-    dalvik.vm.systemuicompilerfilter=speed-profile
-else
+# Compile SystemUI on device with `speed`.
 PRODUCT_PROPERTY_OVERRIDES += \
     dalvik.vm.systemuicompilerfilter=speed
-endif
 
 # Keymaster configuration
 PRODUCT_COPY_FILES += \
@@ -1166,10 +1126,3 @@ include hardware/google/pixel/HardwareInfo/HardwareInfo.mk
 
 # Touch service
 include device/google/gs-common/touch/twoshay/aidl_gs101.mk
-include device/google/gs-common/touch/twoshay/twoshay.mk
-
-# Allow longer timeout for incident report generation in bugreport
-# Overriding in /product partition instead of /vendor intentionally,
-# since it can't be overridden from /vendor.
-PRODUCT_PRODUCT_PROPERTIES += \
-	dumpstate.strict_run=false

device_framework_matrix_product.xml

@@ -78,7 +78,7 @@
     </hal>
     <hal format="aidl" optional="true">
       <name>com.google.hardware.pixel.display</name>
-        <version>13</version>
+        <version>10</version>
         <interface>
             <name>IDisplay</name>
             <instance>default</instance>
@@ -118,7 +118,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>vendor.google.wifi_ext</name>
-        <version>2-4</version>
+        <version>2-3</version>
         <interface>
             <name>IWifiExt</name>
             <instance>default</instance>

dumpstate/Android.bp

@@ -2,20 +2,10 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-cc_binary {
-    name: "dump_power",
-    srcs: ["dump_power.cpp"],
-    cflags: [
-        "-Wall",
-        "-Wextra",
-        "-Werror",
-    ],
-    shared_libs: [
-        "libbase",
-        "libdump",
-        "libdumpstateutil",
-    ],
+sh_binary {
+    name: "dump_gs101.sh",
+    src: "dump_gs101.sh",
     vendor: true,
-    relative_install_path: "dump",
-    init_rc: ["dump_power.rc"],
+    sub_dir: "dump",
 }
+

dumpstate/dump_gs101.sh

@@ -0,0 +1,292 @@
+#!/vendor/bin/sh
+echo "------ Camera HAL Graph State Dump ------"
+for f in $(ls -t /data/vendor/camera/hal_graph_state*.txt |head -1); do
+  echo $f
+  cat $f
+done
+
+build_type="$(getprop ro.build.type)"
+
+echo "\n------ Power Stats Times ------"
+echo -n "Boot: " && /vendor/bin/uptime -s && echo -n "Now: " && date;
+
+echo "\n------ ACPM stats ------"
+for f in /sys/devices/platform/acpm_stats/*_stats ; do
+  echo "\n\n$f"
+  cat $f
+done
+
+echo "\n------ CPU PM stats ------"
+cat "/sys/devices/system/cpu/cpupm/cpupm/time_in_state"
+
+echo "\n------ GENPD summary ------"
+cat "/d/pm_genpd/pm_genpd_summary"
+
+echo "\n------ Power supply property battery ------"
+cat "/sys/class/power_supply/battery/uevent"
+echo "\n------ Power supply property dc ------"
+cat "/sys/class/power_supply/dc/uevent"
+echo "\n------ Power supply property gcpm ------"
+cat "/sys/class/power_supply/gcpm/uevent"
+echo "\n------ Power supply property gcpm_pps ------"
+cat "/sys/class/power_supply/gcpm_pps/uevent"
+echo "\n------ Power supply property main-charger ------"
+cat "/sys/class/power_supply/main-charger/uevent"
+echo "\n------ Power supply property pca9486-mains ------"
+cat "/sys/class/power_supply/pca9468-mains/uevent"
+echo "\n------ Power supply property tcpm ------"
+cat /sys/class/power_supply/tcpm-source-psy-*/uevent
+echo "\n------ Power supply property usb ------"
+cat "/sys/class/power_supply/usb/uevent"
+echo "\n------ Power supply property wireless ------"
+cat "/sys/class/power_supply/wireless/uevent"
+
+if [ -d "/sys/class/power_supply/maxfg" ]
+then
+  echo "\n------ Power supply property maxfg ------"
+  cat "/sys/class/power_supply/maxfg/uevent"
+  echo "\n------ m5_state ------"
+  cat "/sys/class/power_supply/maxfg/m5_model_state"
+  echo "\n------ maxfg ------"
+  cat "/dev/logbuffer_maxfg"
+  echo "\n------ maxfg ------"
+  cat "/dev/logbuffer_maxfg_monitor"
+else
+  echo "\n------ Power supply property maxfg_base ------"
+  cat "/sys/class/power_supply/maxfg_base/uevent"
+  echo "\n------ Power supply property maxfg_flip ------"
+  cat "/sys/class/power_supply/maxfg_flip/uevent"
+  echo "\n------ m5_state ------"
+  cat "/sys/class/power_supply/maxfg_base/m5_model_state"
+  echo "\n------ maxfg_base ------"
+  cat "/dev/logbuffer_maxfg_base"
+  echo "\n------ maxfg_flip ------"
+  cat "/dev/logbuffer_maxfg_flip"
+  echo "\n------ maxfg_base ------"
+  cat "/dev/logbuffer_maxfg_base_monitor"
+  echo "\n------ maxfg_flip ------"
+  cat "/dev/logbuffer_maxfg_flip_monitor"
+fi
+
+if [ -d "/sys/class/power_supply/dock" ]
+then
+  echo "\n------ Power supply property dock ------"
+  cat "/sys/class/power_supply/dock/uevent"
+fi
+
+if [ -e "/dev/logbuffer_tcpm" ]
+then
+  echo "\n------ Logbuffer TCPM ------"
+  cat "/dev/logbuffer_tcpm"
+  if [ -d "/sys/kernel/debug/tcpm" ]
+  then
+    echo "\n------ TCPM logs ------"
+    cat /sys/kernel/debug/tcpm/*
+  else
+    echo "\n------ TCPM logs ------"
+    cat /sys/kernel/debug/usb/tcpm*
+  fi
+fi
+
+echo "\n------ TCPC ------"
+max77759tcpc_path="/sys/devices/platform/10d50000.hsi2c/i2c-12/12-0025"
+echo "registers:"
+cat $max77759tcpc_path/registers
+echo "frs:"
+cat $max77759tcpc_path/frs
+echo "auto_discharge:"
+cat $max77759tcpc_path/auto_discharge
+echo "bc12_enabled:"
+cat $max77759tcpc_path/bc12_enabled
+echo "cc_toggle_enable:"
+cat $max77759tcpc_path/cc_toggle_enable
+echo "contaminant_detection:"
+cat $max77759tcpc_path/contaminant_detection
+echo "contaminant_detection_status:"
+cat $max77759tcpc_path/contaminant_detection_status
+
+echo "\n------ PD Engine ------"
+cat "/dev/logbuffer_usbpd"
+echo "\n------ POGO Transport ------"
+cat "/dev/logbuffer_pogo_transport"
+echo "\n------ PPS-google_cpm ------"
+cat "/dev/logbuffer_cpm"
+echo "\n------ PPS-dc ------"
+cat "/dev/logbuffer_pca9468"
+
+echo "\n------ Battery Health ------"
+cat "/sys/class/power_supply/battery/health_index_stats"
+echo "\n------ Battery Health SoC Residency ------"
+cat "/sys/class/power_supply/battery/swelling_data"
+echo "\n------ BMS ------"
+cat "/dev/logbuffer_ssoc"
+echo "\n------ TTF ------"
+cat "/dev/logbuffer_ttf"
+echo "\n------ TTF details ------"
+cat "/sys/class/power_supply/battery/ttf_details"
+echo "\n------ TTF stats ------"
+cat "/sys/class/power_supply/battery/ttf_stats"
+echo "\n------ maxq ------"
+cat "/dev/logbuffer_maxq"
+echo "\n------ aacr_state ------"
+cat "/sys/class/power_supply/battery/aacr_state"
+echo "\n------ TEMP/DOCK-DEFEND ------"
+cat "/dev/logbuffer_bd"
+
+echo "\n------ TRICKLE-DEFEND Config ------"
+cd /sys/devices/platform/google,battery/power_supply/battery/
+for f in `ls bd_*`
+do
+  echo $f: `cat $f`
+done
+
+echo "\n------ DWELL-DEFEND Config ------"
+cd /sys/devices/platform/google,charger/
+for f in `ls charge_s*`
+do
+  echo "$f: `cat $f`"
+done
+
+echo "\n------ TEMP-DEFEND Config ------"
+cd /sys/devices/platform/google,charger/
+for f in `ls bd_*`
+do
+  echo "$f: `cat $f`"
+done
+
+echo "\n------ DC_registers dump ------"
+cat "/sys/class/power_supply/pca9468-mains/device/registers_dump"
+echo "\n------ max77759_chg registers dump ------"
+cat "/sys/class/power_supply/main-charger/device/registers_dump"
+echo "\n------ max77729_pmic registers dump ------"
+cat /sys/devices/platform/10d50000.hsi2c/i2c-*/*-0066/registers_dump
+
+if [ $build_type = "eng" ]
+then
+  echo "\n------ Charging table dump ------"
+  cat "/d/google_battery/chg_raw_profile"
+
+  echo "\n------ fg_model ------"
+  for f in /d/maxfg*
+  do
+    regs=`cat $f/fg_model`
+    echo $f:
+    echo "$regs"
+  done
+
+  echo "\n------ fg_alo_ver ------"
+  for f in /d/maxfg*
+  do
+    regs=`cat $f/algo_ver`
+    echo $f:
+    echo "$regs"
+  done
+
+  echo "\n------ fg_model_ok ------"
+  for f in /d/maxfg*
+  do
+    regs=`cat $f/model_ok`
+    echo $f:
+    echo "$regs"
+  done
+
+  echo "\n------ fg registers ------"
+  for f in /d/maxfg*
+  do
+    regs=`cat $f/registers`
+    echo $f:
+    echo "$regs"
+  done
+fi
+
+echo "\n------ Battery EEPROM ------"
+if [ -e "/sys/devices/platform/10970000.hsi2c/i2c-8/8-0050/eeprom" ]
+then
+  xxd /sys/devices/platform/10970000.hsi2c/i2c-8/8-0050/eeprom
+fi
+
+echo "\n------ Charger Stats ------"
+cat "/sys/class/power_supply/battery/charge_details"
+if [ $build_type = "eng" ]
+then
+  echo "\n------ Google Charger ------"
+  cd /sys/kernel/debug/google_charger/
+  for f in `ls pps_*`
+  do
+    echo "$f: `cat $f`"
+  done
+  echo "\n------ Google Battery ------"
+  cd /sys/kernel/debug/google_battery/
+  for f in `ls ssoc_*`
+  do
+    echo "$f: `cat $f`"
+  done
+fi
+
+echo "\n------ WLC logs ------"
+cat "/dev/logbuffer_wireless"
+echo "\n------ WLC VER ------"
+cat "/sys/class/power_supply/wireless/device/version"
+echo "\n------ WLC STATUS ------"
+cat "/sys/class/power_supply/wireless/device/status"
+echo "\n------ WLC FW Version ------"
+cat "/sys/class/power_supply/wireless/device/fw_rev"
+echo "\n------ RTX ------"
+cat "/dev/logbuffer_rtx"
+
+if [ $build_type = "eng" ]
+then
+  echo "\n------ gvotables ------"
+  cat /sys/kernel/debug/gvotables/*/status
+fi
+
+echo "\n------ Mitigation Stats ------"
+echo "Source\t\tCount\tSOC\tTime\tVoltage"
+for f in `ls /sys/devices/virtual/pmic/mitigation/last_triggered_count/*`
+do
+  count=`cat $f`
+  a=${f/\/sys\/devices\/virtual\/pmic\/mitigation\/last_triggered_count\//}
+  b=${f/last_triggered_count/last_triggered_capacity}
+  c=${f/last_triggered_count/last_triggered_timestamp/}
+  d=${f/last_triggered_count/last_triggered_voltage/}
+  cnt=`cat $f`
+  cap=`cat ${b/count/cap}`
+  ti=`cat ${c/count/time}`
+  volt=`cat ${d/count/volt}`
+  echo "${a/_count/} \t$cnt\t$cap\t$ti\t$volt"
+done
+
+echo "\n------ Clock Divider Ratio ------"
+echo \"Source\t\tRatio\"
+for f in `ls /sys/devices/virtual/pmic/mitigation/clock_ratio/*`
+do ratio=`cat $f`
+  a=${f/\/sys\/devices\/virtual\/pmic\/mitigation\/clock_ratio\//}
+  echo "${a/_ratio/} \t$ratio"
+done
+
+echo "\n------ Clock Stats ------"
+echo "Source\t\tStats"
+for f in `ls /sys/devices/virtual/pmic/mitigation/clock_stats/*`
+do
+  stats=`cat $f`
+  a=${f/\/sys\/devices\/virtual\/pmic\/mitigation\/clock_stats\//};
+  echo "${a/_stats/} \t$stats"
+done
+
+echo "\n------ Triggered Level ------"
+echo "Source\t\tLevel"
+for f in `ls /sys/devices/virtual/pmic/mitigation/triggered_lvl/*`
+do
+  lvl=`cat $f`
+  a=${f/\/sys\/devices\/virtual\/pmic\/mitigation\/triggered_lvl\//}
+  echo "${a/_lvl/} \t$lvl"
+done
+
+echo "\n------ Instruction ------"
+for f in `ls /sys/devices/virtual/pmic/mitigation/instruction/*`
+do
+  val=`cat $f`
+  a=${f/\/sys\/devices\/virtual\/pmic\/mitigation\/instruction\//}
+  echo "$a=$val"
+done
+

dumpstate/dump_power.cpp

@@ -1,788 +0,0 @@
-
-/*
- * Copyright 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.
- */
-#include <cstring>
-#include <dirent.h>
-#include <dump/pixel_dump.h>
-#include <fstream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/sysinfo.h>
-#include <time.h>
-#include <vector>
-#include <android-base/file.h>
-#include <android-base/strings.h>
-#include "DumpstateUtil.h"
-void printTitle(const char *msg) {
-    printf("\n------ %s ------\n", msg);
-}
-int getCommandOutput(const char *cmd, std::string *output) {
-    char buffer[1024];
-    FILE *pipe = popen(cmd, "r");
-    if (!pipe) {
-        return -1;
-    }
-    while (fgets(buffer, sizeof buffer, pipe) != NULL) {
-        *output += buffer;
-    }
-    pclose(pipe);
-    if (output->back() == '\n')
-        output->pop_back();
-    return 0;
-}
-bool isValidFile(const char *file) {
-    FILE *fp = fopen(file, "r");
-    if (fp != NULL) {
-        fclose(fp);
-        return true;
-    }
-    return false;
-}
-bool isValidDir(const char *directory) {
-    DIR *dir = opendir(directory);
-    if (dir == NULL)
-        return false;
-
-    closedir(dir);
-    return true;
-}
-bool isUserBuild() {
-    return ::android::os::dumpstate::PropertiesHelper::IsUserBuild();
-}
-int getFilesInDir(const char *directory, std::vector<std::string> *files) {
-    std::string content;
-    struct dirent *entry;
-    DIR *dir = opendir(directory);
-    if (dir == NULL)
-        return -1;
-    files->clear();
-    while ((entry = readdir(dir)) != NULL)
-        files->push_back(entry->d_name);
-    closedir(dir);
-    sort(files->begin(), files->end());
-    return 0;
-}
-void dumpPowerStatsTimes() {
-    const char *title = "Power Stats Times";
-    char rBuff[128];
-    struct timespec rTs;
-    struct sysinfo info;
-    int ret;
-    printTitle(title);
-    sysinfo(&info);
-    const time_t boottime = time(NULL) - info.uptime;
-    ret = clock_gettime(CLOCK_REALTIME, &rTs);
-    if (ret)
-        return;
-    struct tm *nowTime = std::localtime(&rTs.tv_sec);
-    std::strftime(rBuff, sizeof(rBuff), "%m/%d/%Y %H:%M:%S", nowTime);
-    printf("Boot: %s", ctime(&boottime));
-    printf("Now: %s\n", rBuff);
-}
-int readContentsOfDir(const char* title, const char* directory, const char* strMatch,
-        bool useStrMatch = false, bool printDirectory = false) {
-    std::vector<std::string> files;
-    std::string content;
-    std::string fileLocation;
-    int ret;
-    ret = getFilesInDir(directory, &files);
-    if (ret < 0)
-        return ret;
-    printTitle(title);
-    for (auto &file : files) {
-        if (useStrMatch && std::string::npos == std::string(file).find(strMatch)) {
-            continue;
-        }
-        fileLocation = std::string(directory) + std::string(file);
-        if (!android::base::ReadFileToString(fileLocation, &content)) {
-            continue;
-        }
-        if (printDirectory) {
-            printf("\n\n%s\n", fileLocation.c_str());
-        }
-        if (content.back() == '\n')
-            content.pop_back();
-        printf("%s\n", content.c_str());
-    }
-    return 0;
-}
-void dumpAcpmStats() {
-    const char* acpmDir = "/sys/devices/platform/acpm_stats/";
-    const char* statsSubStr = "_stats";
-    const char* acpmTitle = "ACPM stats";
-    readContentsOfDir(acpmTitle, acpmDir, statsSubStr, true, true);
-}
-void dumpPowerSupplyStats() {
-    const char* dumpList[][2] = {
-            {"CPU PM stats", "/sys/devices/system/cpu/cpupm/cpupm/time_in_state"},
-            {"Power supply property battery", "/sys/class/power_supply/battery/uevent"},
-            {"Power supply property dc", "/sys/class/power_supply/dc/uevent"},
-            {"Power supply property gcpm", "/sys/class/power_supply/gcpm/uevent"},
-            {"Power supply property gcpm_pps", "/sys/class/power_supply/gcpm_pps/uevent"},
-            {"Power supply property main-charger", "/sys/class/power_supply/main-charger/uevent"},
-            {"Power supply property pca9468-mains", "/sys/class/power_supply/pca9468-mains/uevent"},
-            {"Power supply property tcpm", "/sys/class/power_supply/tcpm-source-psy-i2c-max77759tcpc/uevent"},
-            {"Power supply property usb", "/sys/class/power_supply/usb/uevent"},
-            {"Power supply property wireless", "/sys/class/power_supply/wireless/uevent"},
-    };
-    for (const auto &row : dumpList) {
-        dumpFileContent(row[0], row[1]);
-    }
-}
-void dumpMaxFg() {
-    const char *maxfgLoc = "/sys/class/power_supply/maxfg";
-    const char *maxfg [][2] = {
-            {"Power supply property maxfg", "/sys/class/power_supply/maxfg/uevent"},
-            {"m5_state", "/sys/class/power_supply/maxfg/m5_model_state"},
-            {"maxfg registers", "/sys/class/power_supply/maxfg/registers_dump"},
-            {"maxfg logbuffer", "/dev/logbuffer_maxfg"},
-            {"maxfg_monitor logbuffer", "/dev/logbuffer_maxfg_monitor"},
-    };
-    std::string content;
-    if (isValidDir(maxfgLoc)) {
-        for (const auto &row : maxfg) {
-            dumpFileContent(row[0], row[1]);
-        }
-    }
-}
-void dumpPowerSupplyDock() {
-    const char* powerSupplyPropertyDockTitle = "Power supply property dock";
-    const char* powerSupplyPropertyDockFile = "/sys/class/power_supply/dock/uevent";
-    dumpFileContent(powerSupplyPropertyDockTitle, powerSupplyPropertyDockFile);
-}
-void dumpLogBufferTcpm() {
-    const char* logbufferTcpmTitle = "Logbuffer TCPM";
-    const char* logbufferTcpmFile = "/dev/logbuffer_tcpm";
-    const char* debugTcpmFile = "/sys/kernel/debug/tcpm";
-    const char* tcpmLogTitle = "TCPM logs";
-    const char* tcpmFile = "/sys/kernel/debug/tcpm";
-    const char* tcpmFileAlt = "/sys/kernel/debug/usb/tcpm";
-    int retCode;
-    dumpFileContent(logbufferTcpmTitle, logbufferTcpmFile);
-    retCode = readContentsOfDir(tcpmLogTitle, isValidFile(debugTcpmFile) ? tcpmFile : tcpmFileAlt,
-            NULL);
-    if (retCode < 0)
-        printTitle(tcpmLogTitle);
-}
-void dumpTcpc() {
-    int ret;
-    const char* max77759TcpcHead = "TCPC";
-    const char* i2cSubDirMatch = "i2c-";
-    const char* directory = "/sys/devices/platform/10d60000.hsi2c/";
-    const char* max77759Tcpc [][2] {
-            {"registers:", "/i2c-max77759tcpc/registers"},
-            {"frs:", "/i2c-max77759tcpc/frs"},
-            {"auto_discharge:", "/i2c-max77759tcpc/auto_discharge"},
-            {"bcl2_enabled:", "/i2c-max77759tcpc/bcl2_enabled"},
-            {"cc_toggle_enable:", "/i2c-max77759tcpc/cc_toggle_enable"},
-            {"containment_detection:", "/i2c-max77759tcpc/containment_detection"},
-            {"containment_detection_status:", "/i2c-max77759tcpc/containment_detection_status"},
-    };
-    std::vector<std::string> files;
-    std::string content;
-    printTitle(max77759TcpcHead);
-    ret = getFilesInDir(directory, &files);
-    if (ret < 0) {
-        for (auto &tcpcVal : max77759Tcpc)
-            printf("%s\n", tcpcVal[0]);
-        return;
-    }
-    for (auto &file : files) {
-        for (auto &tcpcVal : max77759Tcpc) {
-            printf("%s ", tcpcVal[0]);
-            if (std::string::npos == std::string(file).find(i2cSubDirMatch)) {
-                continue;
-            }
-            std::string fileName = directory + file + "/" + std::string(tcpcVal[1]);
-            if (!android::base::ReadFileToString(fileName, &content)) {
-                continue;
-            }
-            printf("%s\n", content.c_str());
-        }
-    }
-}
-void dumpPdEngine() {
-    const char* pdEngine [][2] {
-            {"PD Engine", "/dev/logbuffer_usbpd"},
-            {"PPS-google_cpm logbuffer", "/dev/logbuffer_cpm"},
-            {"PPS-pca9468 logbuffer", "/dev/logbuffer_pca9468"},
-    };
-    for (const auto &row : pdEngine) {
-        dumpFileContent(row[0], row[1]);
-    }
-}
-void dumpBatteryHealth() {
-    const char* batteryHealth [][2] {
-            {"Battery Health", "/sys/class/power_supply/battery/health_index_stats"},
-            {"Battery Health SoC Residency", "/sys/class/power_supply/battery/swelling_data"},
-            {"BMS", "/dev/logbuffer_ssoc"},
-            {"TTF", "/dev/logbuffer_ttf"},
-            {"TTF details", "/sys/class/power_supply/battery/ttf_details"},
-            {"TTF stats", "/sys/class/power_supply/battery/ttf_stats"},
-            {"aacr_state", "/sys/class/power_supply/battery/aacr_state"},
-            {"maxq", "/dev/logbuffer_maxq"},
-            {"TEMP/DOCK-DEFEND", "/dev/logbuffer_bd"},
-    };
-    for (const auto &row : batteryHealth) {
-        dumpFileContent(row[0], row[1]);
-    }
-}
-void dumpBatteryDefend() {
-    const char* defendConfig [][3] {
-            {"TRICKLE-DEFEND Config",
-                    "/sys/devices/platform/google,battery/power_supply/battery/", "bd_"},
-            {"DWELL-DEFEND Config", "/sys/devices/platform/google,charger/", "charge_s"},
-            {"TEMP-DEFEND Config", "/sys/devices/platform/google,charger/", "bd_"},
-    };
-    std::vector<std::string> files;
-    struct dirent *entry;
-    std::string content;
-    std::string fileLocation;
-    for (auto &config : defendConfig) {
-        DIR *dir = opendir(config[1]);
-        if (dir == NULL)
-            continue;
-        printTitle(config[0]);
-        while ((entry = readdir(dir)) != NULL) {
-            if (std::string(entry->d_name).find(config[2]) != std::string::npos &&
-                    strncmp(config[2], entry->d_name, strlen(config[2])) == 0) {
-                files.push_back(entry->d_name);
-            }
-        }
-        closedir(dir);
-        sort(files.begin(), files.end());
-        for (auto &file : files) {
-            fileLocation = std::string(config[1]) + std::string(file);
-            if (!android::base::ReadFileToString(fileLocation, &content) || content.empty()) {
-                content = "\n";
-            }
-            printf("%s: %s", file.c_str(), content.c_str());
-            if (content.back() != '\n')
-                printf("\n");
-        }
-        files.clear();
-    }
-}
-void dumpBatteryCaretaker() {
-    const char* aacpConfig [][3] {
-            {"AACP Version",
-                    "/sys/devices/platform/google,battery/power_supply/battery/", "aacp_"},
-            {"AACR Config",
-                    "/sys/devices/platform/google,battery/power_supply/battery/", "aacr_"},
-            {"AAFV Config",
-                    "/sys/devices/platform/google,battery/power_supply/battery/", "aafv_"},
-            {"AACT Config",
-                    "/sys/devices/platform/google,battery/power_supply/battery/", "aact_"},
-            {"AACC",
-                    "/sys/devices/platform/google,battery/power_supply/battery/", "aacc"},
-    };
-    std::vector<std::string> files;
-    struct dirent *entry;
-    std::string content;
-    std::string fileLocation;
-    for (auto &config : aacpConfig) {
-        DIR *dir = opendir(config[1]);
-        if (dir == NULL)
-            continue;
-        printTitle(config[0]);
-        while ((entry = readdir(dir)) != NULL) {
-            if (std::string(entry->d_name).find(config[2]) != std::string::npos &&
-                    strncmp(config[2], entry->d_name, strlen(config[2])) == 0) {
-                files.push_back(entry->d_name);
-            }
-        }
-        closedir(dir);
-        sort(files.begin(), files.end());
-        for (auto &file : files) {
-            fileLocation = std::string(config[1]) + std::string(file);
-            if (!android::base::ReadFileToString(fileLocation, &content) || content.empty()) {
-                content = "\n";
-            }
-            printf("%s: %s", file.c_str(), content.c_str());
-            if (content.back() != '\n')
-                printf("\n");
-        }
-        files.clear();
-    }
-}
-void printValuesOfDirectory(const char *directory, std::string debugfs, const char *strMatch) {
-    std::vector<std::string> files;
-    auto info = directory;
-    std::string content;
-    struct dirent *entry;
-    DIR *dir = opendir(debugfs.c_str());
-    if (dir == NULL)
-        return;
-
-    printTitle((debugfs + std::string(strMatch) + "/" + std::string(info)).c_str());
-    while ((entry = readdir(dir)) != NULL)
-        if (std::string(entry->d_name).find(strMatch) != std::string::npos)
-            files.push_back(entry->d_name);
-    closedir(dir);
-
-    sort(files.begin(), files.end());
-
-    for (auto &file : files) {
-        std::string fileDirectory = debugfs + file;
-        std::string fileLocation = fileDirectory + "/" + std::string(info);
-        if (!android::base::ReadFileToString(fileLocation, &content)) {
-            content = "\n";
-        }
-
-        printf("%s:\n%s", fileDirectory.c_str(), content.c_str());
-
-        if (content.back() != '\n')
-            printf("\n");
-    }
-    files.clear();
-}
-void dumpChg() {
-    const std::string pmic_bus = "/sys/devices/platform/10d50000.hsi2c/i2c-12/12-0066";
-    const char* chg_reg_dump_file = "/sys/class/power_supply/main-charger/device/registers_dump";
-    const std::string chg_name_cmd = "/sys/class/power_supply/main-charger/device/name";
-    const std::string pmic_name_cmd = pmic_bus + "/name";
-    const std::string pmic_reg_dump_file = pmic_bus + "/registers_dump";
-    const std::string reg_dump_str = " registers dump";
-    const char* chgConfig [][2] {
-        {"DC_registers dump", "/sys/class/power_supply/pca9468-mains/device/registers_dump"},
-    };
-    std::string chg_name;
-    std::string pmic_name;
-
-    printf("\n");
-
-    int ret = android::base::ReadFileToString(chg_name_cmd, &chg_name);
-    if (ret && !chg_name.empty()) {
-        chg_name.erase(chg_name.length() - 1); // remove new line
-        const std::string chg_reg_dump_title = chg_name + reg_dump_str;
-
-        /* CHG reg dump */
-        dumpFileContent(chg_reg_dump_title.c_str(), chg_reg_dump_file);
-    }
-
-    ret = android::base::ReadFileToString(pmic_name_cmd, &pmic_name);
-    if (ret && !pmic_name.empty()) {
-        pmic_name.erase(pmic_name.length() - 1); // remove new line
-        const std::string pmic_reg_dump_title = pmic_name + reg_dump_str;
-
-        /* PMIC reg dump */
-        dumpFileContent(pmic_reg_dump_title.c_str(), pmic_reg_dump_file.c_str());
-    }
-
-    for (auto &config : chgConfig) {
-        dumpFileContent(config[0], config[1]);
-    }
-}
-void dumpChgUserDebug() {
-    const std::string debugfs = "/d/";
-    const char *maxFgDir = "/d/maxfg";
-    const char *maxFgStrMatch = "maxfg";
-    const char *chgTblName = "Charging table dump";
-    const char *chgTblDir = "/d/google_battery/chg_raw_profile";
-
-    const char *maxFgInfo [] {
-            "fg_model",
-            "algo_ver",
-            "model_ok",
-    };
-
-    if (isUserBuild())
-        return;
-
-    dumpFileContent(chgTblName, chgTblDir);
-
-    if (isValidDir(maxFgDir)) {
-        for (auto & directory : maxFgInfo) {
-            printValuesOfDirectory(directory, debugfs, maxFgStrMatch);
-        }
-    }
-}
-void dumpBatteryEeprom() {
-    const char *title = "Battery EEPROM";
-    const char *files[] {
-            "/sys/devices/platform/10970000.hsi2c/i2c-8/8-0050/eeprom",
-    };
-    std::string result;
-    std::string xxdCmd;
-    printTitle(title);
-    for (auto &file : files) {
-        if (!isValidFile(file))
-            continue;
-        xxdCmd = "xxd " + std::string(file);
-        int ret = getCommandOutput(xxdCmd.c_str(), &result);
-        if (ret < 0)
-            return;
-        printf("%s\n", result.c_str());
-    }
-}
-void dumpChargerStats() {
-    const char *chgStatsTitle = "Charger Stats";
-    const char *chgStatsLocation = "/sys/class/power_supply/battery/charge_details";
-    const char *chargerStats [][3] {
-            {"Google Charger", "/sys/kernel/debug/google_charger/", "pps_"},
-            {"Google Battery", "/sys/kernel/debug/google_battery/", "ssoc_"},
-    };
-    std::vector<std::string> files;
-    std::string content;
-    struct dirent *entry;
-    dumpFileContent(chgStatsTitle, chgStatsLocation);
-    if (isUserBuild())
-        return;
-    for (auto &stat : chargerStats) {
-        DIR *dir = opendir(stat[1]);
-        if (dir == NULL)
-            return;
-        printTitle(stat[0]);
-        while ((entry = readdir(dir)) != NULL)
-            if (std::string(entry->d_name).find(stat[2]) != std::string::npos)
-                files.push_back(entry->d_name);
-        closedir(dir);
-        sort(files.begin(), files.end());
-        for (auto &file : files) {
-            std::string fileLocation = std::string(stat[1]) + file;
-            if (!android::base::ReadFileToString(fileLocation, &content)) {
-                content = "\n";
-            }
-            printf("%s: %s", file.c_str(), content.c_str());
-            if (content.back() != '\n')
-                printf("\n");
-        }
-        files.clear();
-    }
-}
-void dumpWlcLogs() {
-    const char *dumpWlcList [][2] {
-            {"WLC Logs", "/dev/logbuffer_wireless"},
-            {"WLC VER", "/sys/class/power_supply/wireless/device/version"},
-            {"WLC STATUS", "/sys/class/power_supply/wireless/device/status"},
-            {"WLC FW Version", "/sys/class/power_supply/wireless/device/fw_rev"},
-            {"RTX", "/dev/logbuffer_rtx"},
-    };
-    for (auto &row : dumpWlcList) {
-        if (!isValidFile(row[1]))
-            printTitle(row[0]);
-        dumpFileContent(row[0], row[1]);
-    }
-}
-void dumpGvoteables() {
-    const char *directory = "/sys/kernel/debug/gvotables/";
-    const char *statusName = "/status";
-    const char *title = "gvotables";
-    std::string content;
-    std::vector<std::string> files;
-    int ret;
-    if (isUserBuild())
-        return;
-    ret = getFilesInDir(directory, &files);
-    if (ret < 0)
-        return;
-    printTitle(title);
-    for (auto &file : files) {
-        std::string fileLocation = std::string(directory) + file + std::string(statusName);
-        if (!android::base::ReadFileToString(fileLocation, &content)) {
-            continue;
-        }
-        printf("%s: %s", file.c_str(), content.c_str());
-        if (content.back() != '\n')
-            printf("\n");
-    }
-    files.clear();
-}
-void dumpMitigation() {
-    const char *mitigationList [][2] {
-            {"Lastmeal" , "/data/vendor/mitigation/lastmeal.txt"},
-            {"Thismeal" , "/data/vendor/mitigation/thismeal.txt"},
-    };
-    for (auto &row : mitigationList) {
-        if (!isValidFile(row[1]))
-            printTitle(row[0]);
-        dumpFileContent(row[0], row[1]);
-    }
-}
-void dumpMitigationStats() {
-    int ret;
-    const char *directory = "/sys/devices/virtual/pmic/mitigation/last_triggered_count/";
-    const char *capacityDirectory = "/sys/devices/virtual/pmic/mitigation/last_triggered_capacity/";
-    const char *timestampDirectory =
-            "/sys/devices/virtual/pmic/mitigation/last_triggered_timestamp/";
-    const char *voltageDirectory = "/sys/devices/virtual/pmic/mitigation/last_triggered_voltage/";
-    const char *capacitySuffix = "_cap";
-    const char *timeSuffix = "_time";
-    const char *voltageSuffix = "_volt";
-    const char *countSuffix = "_count";
-    const char *title = "Mitigation Stats";
-    std::vector<std::string> files;
-    std::string content;
-    std::string fileLocation;
-    std::string source;
-    std::string subModuleName;
-    int count;
-    int soc;
-    int time;
-    int voltage;
-    ret = getFilesInDir(directory, &files);
-    if (ret < 0)
-        return;
-    printTitle(title);
-    printf("Source\t\tCount\tSOC\tTime\tVoltage\n");
-    for (auto &file : files) {
-        fileLocation = std::string(directory) + std::string(file);
-        if (!android::base::ReadFileToString(fileLocation, &content)) {
-            continue;
-        }
-        ret = atoi(android::base::Trim(content).c_str());
-        if (ret == -1)
-            continue;
-        count = ret;
-        subModuleName = std::string(file);
-        subModuleName.erase(subModuleName.find(countSuffix), strlen(countSuffix));
-        fileLocation = std::string(capacityDirectory) + std::string(subModuleName) +
-                std::string(capacitySuffix);
-        if (!android::base::ReadFileToString(fileLocation, &content)) {
-            continue;
-        }
-        ret = atoi(android::base::Trim(content).c_str());
-        if (ret == -1)
-            continue;
-        soc = ret;
-        fileLocation = std::string(timestampDirectory) + std::string(subModuleName) +
-                std::string(timeSuffix);
-        if (!android::base::ReadFileToString(fileLocation, &content)) {
-            continue;
-        }
-        ret = atoi(android::base::Trim(content).c_str());
-        if (ret == -1)
-            continue;
-        time = ret;
-        fileLocation = std::string(voltageDirectory) + std::string(subModuleName) +
-                std::string(voltageSuffix);
-        if (!android::base::ReadFileToString(fileLocation, &content)) {
-            continue;
-        }
-        ret = atoi(android::base::Trim(content).c_str());
-        if (ret == -1)
-            continue;
-        voltage = ret;
-        printf("%s \t%i\t%i\t%i\t%i\n", subModuleName.c_str(), count, soc, time, voltage);
-    }
-}
-void dumpMitigationDirs() {
-    const int paramCount = 4;
-    const char *titles[] = {
-            "Clock Divider Ratio",
-            "Clock Stats",
-            "Triggered Level",
-            "Instruction",
-    };
-    const char *directories[] = {
-            "/sys/devices/virtual/pmic/mitigation/clock_ratio/",
-            "/sys/devices/virtual/pmic/mitigation/clock_stats/",
-            "/sys/devices/virtual/pmic/mitigation/triggered_lvl/",
-            "/sys/devices/virtual/pmic/mitigation/instruction/",
-    };
-    const char *paramSuffix[] = {"_ratio", "_stats", "_lvl", ""};
-    const char *titleRowVal[] = {
-            "Source\t\tRatio",
-            "Source\t\tStats",
-            "Source\t\tLevel",
-            "",
-    };
-    const int eraseCnt[] = {6, 6, 4, 0};
-    const bool useTitleRow[] = {true, true, true, false};
-    std::vector<std::string> files;
-    std::string content;
-    std::string fileLocation;
-    std::string source;
-    std::string subModuleName;
-    std::string readout;
-    for (int i = 0; i < paramCount; i++) {
-        printTitle(titles[i]);
-        if (useTitleRow[i]) {
-            printf("%s\n", titleRowVal[i]);
-        }
-        getFilesInDir(directories[i], &files);
-        for (auto &file : files) {
-            fileLocation = std::string(directories[i]) + std::string(file);
-            if (!android::base::ReadFileToString(fileLocation, &content)) {
-                continue;
-            }
-            readout = android::base::Trim(content);
-            subModuleName = std::string(file);
-            subModuleName.erase(subModuleName.find(paramSuffix[i]), eraseCnt[i]);
-            if (useTitleRow[i]) {
-                printf("%s \t%s\n", subModuleName.c_str(), readout.c_str());
-            } else {
-                printf("%s=%s\n", subModuleName.c_str(), readout.c_str());
-            }
-        }
-    }
-}
-void dumpIrqDurationCounts() {
-    const char *title = "IRQ Duration Counts";
-    const char *colNames = "Source\t\t\t\tlt_5ms_cnt\tbt_5ms_to_10ms_cnt\tgt_10ms_cnt\tCode"
-            "\tCurrent Threshold (uA)\tCurrent Reading (uA)\n";
-    const int nonOdpmChannelCnt = 9;
-    const int odpmChCnt = 12;
-    enum Duration {
-        LT_5MS,
-        BT_5MS_10MS,
-        GT_10MS,
-        DUR_MAX,
-    };
-    const char *irqDurDirectories[] = {
-            "/sys/devices/virtual/pmic/mitigation/irq_dur_cnt/less_than_5ms_count",
-            "/sys/devices/virtual/pmic/mitigation/irq_dur_cnt/between_5ms_to_10ms_count",
-            "/sys/devices/virtual/pmic/mitigation/irq_dur_cnt/greater_than_10ms_count",
-    };
-    enum PowerWarn {
-        MAIN,
-        SUB,
-        PWRWARN_MAX,
-    };
-    const char *pwrwarnDirectories[] = {
-            "/sys/devices/virtual/pmic/mitigation/main_pwrwarn/",
-            "/sys/devices/virtual/pmic/mitigation/sub_pwrwarn/",
-    };
-    const char *lpfCurrentDirs[] = {
-            "/sys/devices/platform/acpm_mfd_bus@15500000/i2c-1/1-001f/s2mpg14-meter/"
-                    "s2mpg14-odpm/iio:device1/lpf_current",
-            "/sys/devices/platform/acpm_mfd_bus@15510000/i2c-0/0-002f/s2mpg15-meter/"
-                    "s2mpg15-odpm/iio:device0/lpf_current",
-    };
-    bool titlesInitialized = false;
-    std::vector<std::string> channelNames;
-    std::vector<std::string> channelData[DUR_MAX];
-    std::vector<std::string> pwrwarnThreshold[PWRWARN_MAX];
-    std::vector<std::string> pwrwarnCode[PWRWARN_MAX];
-    std::vector<std::string> lpfCurrentVals[PWRWARN_MAX];
-    std::vector<std::string> files;
-    std::string content;
-    std::string token;
-    std::string tokenCh;
-    std::string fileLocation;
-    for (int i = 0; i < DUR_MAX; i++) {
-        if (!android::base::ReadFileToString(irqDurDirectories[i], &content)) {
-            return;
-        }
-        std::istringstream tokenStream(content);
-        while (std::getline(tokenStream, token, '\n')) {
-            if (!titlesInitialized) {
-                tokenCh = token;
-                tokenCh.erase(tokenCh.find(':'), tokenCh.length());
-                channelNames.push_back(tokenCh);
-            }
-            // there is a space after the ':' which needs to be removed
-            token.erase(0, token.find(':') + 1);
-            channelData[i].push_back(token);
-        }
-        if (!titlesInitialized)
-            titlesInitialized = true;
-    }
-    for (int i = 0; i < PWRWARN_MAX; i++) {
-        getFilesInDir(pwrwarnDirectories[i], &files);
-        for (auto &file : files) {
-            fileLocation = std::string(pwrwarnDirectories[i]) + std::string(file);
-            if (!android::base::ReadFileToString(fileLocation, &content)) {
-                continue;
-            }
-            std::string readout;
-            readout = android::base::Trim(content);
-            std::string readoutThreshold = readout;
-            readoutThreshold.erase(0, readoutThreshold.find('=') + 1);
-            std::string readoutCode = readout;
-            readoutCode.erase(readoutCode.find('='), readoutCode.length());
-            pwrwarnThreshold[i].push_back(readoutThreshold);
-            pwrwarnCode[i].push_back(readoutCode);
-        }
-    }
-    for (int i = 0; i < PWRWARN_MAX; i++) {
-        if (!android::base::ReadFileToString(lpfCurrentDirs[i], &content)) {
-            continue;
-        }
-        std::istringstream tokenStream(content);
-        bool first = true;
-        while (std::getline(tokenStream, token, '\n')) {
-            token.erase(0, token.find(' '));
-            if (first) {
-                first = false;
-                continue;
-            }
-            lpfCurrentVals[i].push_back(token);
-        }
-    }
-    printTitle(title);
-    printf("%s", colNames);
-    for (uint i = 0; i < channelNames.size(); i++) {
-        std::string code = "";
-        std::string threshold = "";
-        std::string current = "";
-        std::string ltDataMsg = "";
-        std::string btDataMsg = "";
-        std::string gtDataMsg = "";
-        int pmicSel = 0;
-        int offset = 0;
-        std::string channelNameSuffix = "      \t";
-        if (i >= nonOdpmChannelCnt) {
-            offset = nonOdpmChannelCnt;
-            if (i >= (odpmChCnt + nonOdpmChannelCnt)) {
-                pmicSel = 1;
-                offset = odpmChCnt + nonOdpmChannelCnt;
-            }
-            channelNameSuffix = "";
-            code = pwrwarnCode[pmicSel][i - offset];
-            threshold = pwrwarnThreshold[pmicSel][i - offset];
-            current = lpfCurrentVals[pmicSel][i - offset];
-        }
-        if (i < channelData[0].size())
-            ltDataMsg = channelData[0][i];
-        if (i < channelData[1].size())
-            btDataMsg = channelData[1][i];
-        if (i < channelData[2].size())
-            gtDataMsg = channelData[2][i];
-        std::string adjustedChannelName = channelNames[i] + channelNameSuffix;
-        printf("%s     \t%s\t\t%s\t\t\t%s\t\t%s    \t%s       \t\t%s\n",
-                adjustedChannelName.c_str(),
-                ltDataMsg.c_str(),
-                btDataMsg.c_str(),
-                gtDataMsg.c_str(),
-                code.c_str(),
-                threshold.c_str(),
-                current.c_str());
-    }
-}
-int main() {
-    dumpPowerStatsTimes();
-    dumpAcpmStats();
-    dumpPowerSupplyStats();
-    dumpMaxFg();
-    dumpPowerSupplyDock();
-    dumpLogBufferTcpm();
-    dumpTcpc();
-    dumpPdEngine();
-    dumpBatteryHealth();
-    dumpBatteryDefend();
-    dumpBatteryCaretaker();
-    dumpChg();
-    dumpChgUserDebug();
-    dumpBatteryEeprom();
-    dumpChargerStats();
-    dumpWlcLogs();
-    dumpGvoteables();
-    dumpMitigation();
-    dumpMitigationStats();
-    dumpMitigationDirs();
-    dumpIrqDurationCounts();
-}

dumpstate/dump_power.rc

@@ -1,131 +0,0 @@
-on init
-    # Dump maxfg
-    chown system system /sys/class/power_supply/maxfg/m5_model_state
-    chown system system /sys/class/power_supply/maxfg_base/model_state
-    chown system system /sys/class/power_supply/max77779fg/model_state
-
-    # Dump eeprom
-    chown system system /sys/devices/platform/10c90000.hsi2c/i2c-9/9-0050/eeprom
-    chown system system /sys/devices/platform/10ca0000.hsi2c/i2c-10/10-0050/eeprom
-
-    chown system system /dev/battery_history
-    chmod 0644 /dev/battery_history
-
-    chown system system /dev/maxfg_history
-    chmod 0644 /dev/maxfg_history
-
-    # Charge stats (write 0)
-    chown system system /sys/class/power_supply/battery/charge_stats
-
-    # Pca Charge stats (write 0)
-    chown system system /sys/class/power_supply/dc-mains/device/chg_stats
-
-    # Wireless Charge stats (write 0)
-    chown system system /sys/class/power_supply/wireless/device/charge_stats
-
-    # Thermal Charge stats (write 0)
-    chown system system /sys/devices/platform/google,charger/thermal_stats
-
-    # Google Charger stats (write 0)
-    chown system system /sys/devices/platform/google,charger/charge_stats
-
-    # Permission for wireless charging
-    chown system system /sys/class/power_supply/wireless/capacity
-    chown system system /sys/class/power_supply/wireless/device/rtx
-    chown system system /sys/class/power_supply/wireless/device/rxdata
-    chown system system /sys/class/power_supply/wireless/device/txdata
-    chown system system /sys/class/power_supply/wireless/device/rxlen
-    chown system system /sys/class/power_supply/wireless/device/txlen
-    chown system system /sys/class/power_supply/wireless/device/ccreset
-    chown system system /sys/class/power_supply/wireless/device/status
-    chown system system /sys/class/power_supply/wireless/device/version
-    chown system system /sys/class/power_supply/wireless/device/features
-    chown system system /sys/class/power_supply/wireless/device/authtype
-    chown system system /sys/class/power_supply/wireless/device/authstart
-
-    # Adaptive charge
-    chown system system /sys/class/power_supply/battery/charge_deadline
-
-    # Charging policy
-    chown system system /sys/class/power_supply/battery/charging_policy
-
-    # BatteryHealthData
-    chown system system /sys/class/power_supply/battery/first_usage_date
-
-    # Battery Defender
-    chown system system /sys/devices/platform/google,battery/power_supply/battery/bd_trickle_cnt
-    chown system system /sys/devices/platform/google,battery/power_supply/battery/bd_trickle_dry_run
-    chown system system /sys/devices/platform/google,battery/power_supply/battery/bd_trickle_enable
-    chown system system /sys/devices/platform/google,battery/power_supply/battery/bd_trickle_recharge_soc
-    chown system system /sys/devices/platform/google,battery/power_supply/battery/bd_trickle_reset_sec
-    chown system system /sys/devices/platform/google,battery/power_supply/battery/bd_clear
-    chown system system /sys/devices/platform/google,battery/power_supply/battery/health_safety_margin
-    chown system system /sys/devices/platform/google,battery/power_supply/battery/swelling_data
-    chown system system /sys/devices/platform/google,charger/bd_drainto_soc
-    chown system system /sys/devices/platform/google,charger/bd_recharge_soc
-    chown system system /sys/devices/platform/google,charger/bd_recharge_voltage
-    chown system system /sys/devices/platform/google,charger/bd_resume_abs_temp
-    chown system system /sys/devices/platform/google,charger/bd_resume_soc
-    chown system system /sys/devices/platform/google,charger/bd_resume_temp
-    chown system system /sys/devices/platform/google,charger/bd_resume_time
-    chown system system /sys/devices/platform/google,charger/bd_temp_dry_run
-    chown system system /sys/devices/platform/google,charger/bd_temp_enable
-    chown system system /sys/devices/platform/google,charger/bd_trigger_temp
-    chown system system /sys/devices/platform/google,charger/bd_trigger_time
-    chown system system /sys/devices/platform/google,charger/bd_trigger_voltage
-    chown system system /sys/devices/platform/google,charger/bd_clear
-    chown system system /sys/devices/platform/google,charger/charge_start_level
-    chown system system /sys/devices/platform/google,charger/charge_stop_level
-    chown system system /sys/devices/platform/google,cpm/dc_ctl
-    # Important to include dd_state as it's used in battery defender in charger mode
-    chown system system /sys/devices/platform/google,charger/dd_state
-    chown system system /sys/devices/platform/google,charger/dd_settings
-
-    # for parsing thismeal.bin
-    chown system system /vendor/bin/hw/battery_mitigation
-
-on early-boot
-    # Wait for insmod_sh to finish all common modules
-    wait_for_prop vendor.common.modules.ready 1
-
-    # logbuffer
-    chown system system /dev/logbuffer_maxfg
-    chown system system /dev/logbuffer_maxfg_monitor
-    chown system system /dev/logbuffer_max77779fg
-    chown system system /dev/logbuffer_max77779fg_monitor
-    chown system system /dev/logbuffer_maxfg_base
-    chown system system /dev/logbuffer_maxfg_secondary
-    chown system system /dev/logbuffer_maxfg_base_monitor
-    chown system system /dev/logbuffer_maxfg_secondary_monitor
-    chown system system /dev/logbuffer_maxq
-    chown system system /dev/logbuffer_rtx
-    chown system system /dev/logbuffer_ssoc
-    chown system system /dev/logbuffer_ttf
-    chown system system /dev/logbuffer_tcpm
-    chown system system /dev/logbuffer_usbpd
-    chown system system /dev/logbuffer_pogo_transport
-    chown system system /dev/logbuffer_wireless
-    chown system system /dev/logbuffer_pca9468
-    chown system system /dev/logbuffer_ln8411
-    chown system system /dev/logbuffer_cpm
-    chown system system /dev/logbuffer_wc68
-    chown system system /dev/logbuffer_max77779_fwupdate
-
-on property:sys.boot_completed=1
-    # gvotables for dumpstate
-    chown system system /sys/kernel/debug/gvotables
-
-    # Permission for wireless charging
-    chown system system /sys/class/power_supply/wireless/capacity
-    chown system system /sys/class/power_supply/wireless/device/rtx
-    chown system system /sys/class/power_supply/wireless/device/rxdata
-    chown system system /sys/class/power_supply/wireless/device/txdata
-    chown system system /sys/class/power_supply/wireless/device/rxlen
-    chown system system /sys/class/power_supply/wireless/device/txlen
-    chown system system /sys/class/power_supply/wireless/device/ccreset
-    chown system system /sys/class/power_supply/wireless/device/status
-    chown system system /sys/class/power_supply/wireless/device/version
-    chown system system /sys/class/power_supply/wireless/device/authstart
-
-    # write serialno to battery path for pairing
-    write /sys/class/power_supply/battery/dev_sn ${ro.boot.serialno}

dumpstate/item.mk

@@ -1,2 +1,2 @@
-PRODUCT_PACKAGES += dump_power
+PRODUCT_PACKAGES += dump_gs101.sh
 

evolution_common.mk

@@ -6,6 +6,3 @@
 
 # PixelParts
 include packages/apps/PixelParts/device.mk
-
-# UDFPS
-TARGET_HAS_UDFPS += true

factory_common.mk

@@ -73,10 +73,12 @@ PRODUCT_PACKAGES += \
 # Disable DebugFS restrictions in factory builds
 PRODUCT_SET_DEBUGFS_RESTRICTIONS := false
 
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 # PixelLogger for RF testing
-PRODUCT_PACKAGES_ENG += \
+PRODUCT_PACKAGES_DEBUG += \
     PixelLogger
 
 # Tool for installing Widevine keybox
-PRODUCT_PACKAGES_ENG += \
+PRODUCT_PACKAGES_DEBUG += \
     WvInstallKeybox
+endif

health/android.hardware.health-service.gs101.xml

@@ -1,7 +1,7 @@
 <manifest version="1.0" type="device">
     <hal format="aidl">
         <name>android.hardware.health</name>
-        <version>4</version>
+        <version>3</version>
         <fqname>IHealth/default</fqname>
     </hal>
 </manifest>

lineage_common.mk

@@ -1,6 +1,6 @@
 #
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# Copyright (C) 2021 The LineageOS Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -26,10 +26,6 @@ PRODUCT_PACKAGES += \
 # Lineage Health
 include hardware/google/pixel/lineage_health/device.mk
 
-$(call soong_config_set,lineage_health,charging_control_supports_deadline,true)
-$(call soong_config_set,lineage_health,charging_control_supports_limit,true)
-$(call soong_config_set,lineage_health,charging_control_supports_toggle,false)
-
 # Linker config
 PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS += \
     device/google/gs101/linker.config.json
@@ -38,9 +34,5 @@ PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS += \
 PRODUCT_PACKAGES += \
     GoogleParts
 
-# Tethering
-PRODUCT_PACKAGES += \
-    TetheringOverlay
-
 # Touch
 include hardware/google/pixel/touch/device.mk

linker.config.json

@@ -1,9 +1,5 @@
 {
   "provideLibs": [
-    "liboemcrypto.so",
-    "lib_aion_buffer.so",
-    "libedgetpu_client.google.so",
-    "libedgetpu_tachyon.google.so",
-    "libedgetpu_util.so"
+    "liboemcrypto.so"
   ]
 }

manifest.xml

@@ -12,6 +12,15 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.graphics.mapper</name>
+        <transport arch="32+64">passthrough</transport>
+        <version>4.0</version>
+        <interface>
+            <name>IMapper</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>android.hardware.graphics.composer</name>
         <transport>hwbinder</transport>

manifest_64.xml

@@ -1,4 +1,13 @@
 <manifest version="1.0" type="device" target-level="5">
+    <hal format="hidl">
+        <name>android.hardware.graphics.mapper</name>
+        <transport arch="32+64">passthrough</transport>
+        <version>4.0</version>
+        <interface>
+            <name>IMapper</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>android.hardware.graphics.composer</name>
         <transport>hwbinder</transport>

manifest_media.xml

@@ -1,12 +1,20 @@
 <manifest version="1.0" type="device">
-    <hal format="aidl">
+    <hal format="hidl">
         <name>android.hardware.media.c2</name>
-        <version>1</version>
-        <fqname>IComponentStore/default1</fqname>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IComponentStore</name>
+            <instance>default1</instance>
+        </interface>
     </hal>
-    <hal format="aidl">
+    <hal format="hidl">
         <name>android.hardware.media.c2</name>
-        <version>1</version>
-        <fqname>IComponentStore/default</fqname>
+        <transport>hwbinder</transport>
+        <version>1.2</version>
+        <interface>
+            <name>IComponentStore</name>
+            <instance>default</instance>
+        </interface>
     </hal>
 </manifest>

manifest_media_aosp.xml

@@ -8,9 +8,4 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl">
-        <name>android.hardware.media.c2</name>
-        <version>1</version>
-        <fqname>IComponentStore/default</fqname>
-    </hal>
 </manifest>

media_codecs_aosp_c2.xml

@@ -100,7 +100,7 @@
         </MediaCodec>
         <MediaCodec name="c2.exynos.vp8.decoder" type="video/x-vnd.on2.vp8" >
             <Limit name="size" min="32x32" max="3840x2160" />
-            <Limit name="alignment" value="1x1" />
+            <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
@@ -113,7 +113,7 @@
         </MediaCodec>
         <MediaCodec name="c2.exynos.vp9.decoder" type="video/x-vnd.on2.vp9" >
             <Limit name="size" min="64x64" max="3840x2176" />
-            <Limit name="alignment" value="1x1" />
+            <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="64x64" />
             <Limit name="block-count" range="1-2040" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
@@ -126,7 +126,7 @@
         </MediaCodec>
         <MediaCodec name="c2.exynos.vp9.decoder.secure" type="video/x-vnd.on2.vp9" >
             <Limit name="size" min="64x64" max="3840x2176" />
-            <Limit name="alignment" value="1x1" />
+            <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="64x64" />
             <Limit name="block-count" range="1-2040" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
@@ -203,7 +203,7 @@
         </MediaCodec>
         <MediaCodec name="c2.exynos.vp8.encoder" type="video/x-vnd.on2.vp8" >
             <Limit name="size" min="32x32" max="3840x2160" />
-            <Limit name="alignment" value="1x1" />
+            <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
@@ -218,7 +218,7 @@
         </MediaCodec>
         <MediaCodec name="c2.exynos.vp9.encoder" type="video/x-vnd.on2.vp9" >
             <Limit name="size" min="64x64" max="3840x2176" />
-            <Limit name="alignment" value="1x1" />
+            <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="64x64" />
             <Limit name="block-count" range="1-2040" />
             <Limit name="blocks-per-second" min="1" max="243000" />

media_codecs_bo_c2.xml

@@ -19,7 +19,7 @@
     <Decoders>
         <MediaCodec name="c2.google.av1.decoder" type="video/av01">
           <Limit name="size" min="96x96" max="3840x2160" />
-          <Limit name="alignment" value="1x1" />
+          <Limit name="alignment" value="2x2" />
           <Limit name="block-size" value="16x16" />
           <Limit name="block-count" range="36-32400" />
           <Limit name="blocks-per-second" min="24" max="1944000" />
@@ -34,7 +34,7 @@
         </MediaCodec>
         <MediaCodec name="c2.google.av1.decoder.secure" type="video/av01">
           <Limit name="size" min="96x96" max="3840x2160" />
-          <Limit name="alignment" value="1x1" />
+          <Limit name="alignment" value="2x2" />
           <Limit name="block-size" value="16x16" />
           <Limit name="block-count" range="36-32400" />
           <Limit name="blocks-per-second" min="24" max="1944000" />

media_codecs_performance_c2.xml

@@ -115,20 +115,20 @@
         </MediaCodec>
         <MediaCodec name="c2.android.avc.decoder" type="video/avc" update="true">
             <!-- measured 90%:342-360 med:343 N=2 -->
-            <Limit name="measured-frame-rate-320x240" range="542-971" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-320x240" range="342-351" /> <!-- v90%=1.0 -->
             <!-- measured 90%:142-147 med:143 N=2 -->
-            <Limit name="measured-frame-rate-720x480" range="162-301" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-720x480" range="142-145" /> <!-- v90%=1.0 -->
             <!-- measured 90%:54-56 med:55 N=2 -->
-            <Limit name="measured-frame-rate-1280x720" range="54-77" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-1280x720" range="54-55" /> <!-- v90%=1.0 -->
             <!-- measured 90%:25-26 med:26 N=2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="25-34" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-1920x1080" range="25-26" /> <!-- v90%=1.0 -->
         </MediaCodec>
         <MediaCodec name="c2.android.hevc.decoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="583-972" /> <!-- N=20 v90%=1.0 -->
-            <Limit name="measured-frame-rate-640x360" range="337-537" /> <!-- v90%=1.0 -->
-            <Limit name="measured-frame-rate-720x480" range="312-470" /> <!-- v90%=1.0 -->
-            <Limit name="measured-frame-rate-1280x720" range="104-165" /> <!-- v90%=1.0 -->
-            <Limit name="measured-frame-rate-1920x1080" range="54-68" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-352x288" range="583-674" /> <!-- N=20 v90%=1.0 -->
+            <Limit name="measured-frame-rate-640x360" range="337-352" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-720x480" range="312-324" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-1280x720" range="104-108" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-1920x1080" range="54-56" /> <!-- v90%=1.0 -->
         </MediaCodec>
         <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true">
             <Limit name="measured-frame-rate-176x144" range="1215-1823" />

overlay-lineage/packages/apps/SimpleDeviceConfig/res/values/config.xml

@@ -20,32 +20,27 @@
         <item>connectivity_thermal_power_manager/apply_action_time_seconds=10</item>
         <item>connectivity_thermal_power_manager/atm_power_threshold_mw=800</item>
         <item>connectivity_thermal_power_manager/cellular_thermal_adaptive_thermal_status_adaptive_action_list=</item>
-        <item>connectivity_thermal_power_manager/criteria_1_enabled=true</item>
-        <item>connectivity_thermal_power_manager/criteria_4_lte_pref_mode=3</item>
         <item>connectivity_thermal_power_manager/wifi_disconnected_time_seconds=180</item>
         <item>connectivity_thermal_power_manager/wifi_internet_driven_endc_product_carrier_id_set=shiba,husky,akita,komodo,tokay,caiman,comet@1,1989,2023,2576,2067,2071,2073,2577,2522,2075,2578,2083,2433,1949</item>
 
         <!-- Live Caption (Pixel 2017 + OEM) -->
         <item>device_personalization_services/Captions__allow_box_x_axis_movement=true</item>
         <item>device_personalization_services/Captions__allow_use_public_speech_recognition=true</item>
-        <item>device_personalization_services/Captions__allow_voip_call_without_audio_recording=true</item>
-        <item>device_personalization_services/Captions__available_for_download=en-US;en-GB;en-CA;en-IE;en-AU;en-SG;en-IN;fr-FR;fr-CA;fr-BE;fr-CH;it-IT;it-CH;de-DE;de-AT;de-BE;de-CH;ja-JP;es-ES;es-US;cmn-Hant-TW;hi-IN;pt-BR;tr-TR;pl-PL;cmn-Hans-CN;ko-KR;ru-RU;vi-VN</item>
+        <item>device_personalization_services/Captions__allow_voip_call_without_audio_recording=false</item>
+        <item>device_personalization_services/Captions__available_for_download=en-US;en-GB;en-CA;en-IE;en-AU;en-SG;en-IN;fr-FR;fr-CA;fr-BE;fr-CH;it-IT;it-CH;de-DE;de-AT;de-BE;de-CH;ja-JP;es-ES;es-US</item>
         <item>device_personalization_services/Captions__disable_prod=false</item>
         <!-- <item>device_personalization_services/Captions__enable=false</item> -->
-        <item>device_personalization_services/Captions__enable_activation_boost=true</item>
         <item>device_personalization_services/Captions__enable_adaptive_box_width=true</item>
         <item>device_personalization_services/Captions__enable_augmented_modality=true</item>
         <item>device_personalization_services/Captions__enable_augmented_modality_input=true</item>
         <item>device_personalization_services/Captions__enable_augmented_modality_language_detection=true</item>
         <item>device_personalization_services/Captions__enable_augmented_music=true</item>
         <!-- <item>device_personalization_services/Captions__enable_clearcut_logging=true</item> -->
-        <item>device_personalization_services/Captions__enable_drag_and_double_tap_to_resize=true</item>
-        <item>device_personalization_services/Captions__enable_ec_integration=false</item>
+        <item>device_personalization_services/Captions__enable_drag_and_double_tap_to_resize=false</item>
         <item>device_personalization_services/Captions__enable_language_detection=true</item>
         <item>device_personalization_services/Captions__enable_one_caption_experiment=false</item>
         <item>device_personalization_services/Captions__enable_punctuations=true</item>
         <item>device_personalization_services/Captions__enable_setting_page=false</item>
-        <item>device_personalization_services/Captions__enable_survey=false</item>
         <item>device_personalization_services/Captions__enable_text_transform=true</item>
         <item>device_personalization_services/Captions__enable_westworld_logging=false</item>
         <item>device_personalization_services/Captions__enable_zero_day=false</item>
@@ -55,9 +50,7 @@
         <item>device_personalization_services/Captions__new_model_version=20210623</item>
         <item>device_personalization_services/Captions__new_model_version_advanced=20221227</item>
         <item>device_personalization_services/Captions__speech_threshold=0.2</item>
-        <item>device_personalization_services/Captions__support_lang_id_disabled_after_dismissals=true</item>
-        <item>device_personalization_services/Captions__supported_languages=en-US;fr-FR;it-IT;de-DE;ja-JP;es-ES;cmn-Hant-TW;hi-IN;pt-BR;tr-TR;pl-PL;cmn-Hans-CN;ko-KR;ru-RU;vi-VN</item>
-        <item>device_personalization_services/Captions__supported_languages_beta_quality=ja-JP;pt-BR;tr-TR;pl-PL;cmn-Hans-CN;ko-KR;ru-RU;vi-VN</item>
+        <item>device_personalization_services/Captions__supported_languages=en-US;fr-FR;it-IT;de-DE;ja-JP;es-ES</item>
         <item>device_personalization_services/Captions__surface_sound_events=true</item>
         <item>device_personalization_services/Captions__text_transform_augmented_input=true</item>
         <item>device_personalization_services/Captions__visibility_playing_duration_millis=5000</item>
@@ -65,23 +58,12 @@
 
         <!-- Now Playing (Pixel 2017) -->
         <item>device_personalization_services/NowPlaying__ambient_music_apk_music_detector_min_score=0.45</item>
-        <item>device_personalization_services/NowPlaying__ambient_music_download_album_art_via_astrea=false</item>
-        <item>device_personalization_services/NowPlaying__ambient_music_enable_resource_download_logging=false</item>
-        <item>device_personalization_services/NowPlaying__ambient_music_enhanced_metadata_shards_manifest=4003:https://storage.googleapis.com/music-iq-db/updatable_db_v4/20241015-000033/manifest.json</item>
         <item>device_personalization_services/NowPlaying__ambient_music_get_model_state_cooldown_seconds_cloud_search=9</item>
-        <item>device_personalization_services/NowPlaying__ambient_music_index_manifest_17_09_02=3105:https://storage.googleapis.com/music-iq-db/updatable_db_v3/20241013-030037/manifest.json</item>
+        <item>device_personalization_services/NowPlaying__ambient_music_index_manifest_17_09_02=3082:https://storage.googleapis.com/music-iq-db/updatable_db_v3/20240421-030101/manifest.json</item>
         <item>device_personalization_services/NowPlaying__ambient_music_matcher_match_threshold_17_09_02=1.0E-6</item>
         <item>device_personalization_services/NowPlaying__ambient_music_on_demand_enabled=true</item>
         <item>device_personalization_services/NowPlaying__ambient_music_on_demand_music_confidence=0.48</item>
-        <item>device_personalization_services/NowPlaying__ambient_music_on_demand_search_use_new_opt_in_flow=false</item>
-        <item>device_personalization_services/NowPlaying__ambient_music_show_album_art=false</item>
-        <item>device_personalization_services/NowPlaying__ambient_music_support_dsp_model_tflite_p6=true</item>
-        <item>device_personalization_services/NowPlaying__ambient_music_use_enhanced_matches_database=false</item>
-        <item>device_personalization_services/NowPlaying__ambient_music_use_metadata_shards_database=false</item>
-        <item>device_personalization_services/NowPlaying__ambient_music_use_yt_domain_fife_urls=false</item>
         <item>device_personalization_services/NowPlaying__cloud_api_allowed=true</item>
-        <item>device_personalization_services/NowPlaying__create_shortcut_on_np_enabled=false</item>
-        <item>device_personalization_services/NowPlaying__default_music_player_setting=false</item>
         <item>device_personalization_services/NowPlaying__dsp_model_checksum_enabled=false</item>
         <!-- <item>device_personalization_services/NowPlaying__enable_usage_fa=true</item> -->
         <item>device_personalization_services/NowPlaying__favorites_enabled=true</item>
@@ -90,12 +72,11 @@
         <item>device_personalization_services/NowPlaying__handle_ambient_music_results_with_history=true</item>
         <item>device_personalization_services/NowPlaying__min_training_interval_millis=86400000</item>
         <item>device_personalization_services/NowPlaying__nnfp_v3_model_enabled=true</item>
-        <item>device_personalization_services/NowPlaying__on_demand_enable_eager_prompt=false</item>
+        <item>device_personalization_services/NowPlaying__on_demand_enable_eager_prompt=true</item>
         <item>device_personalization_services/NowPlaying__on_demand_fingerprinter_being_setup_warning=true</item>
         <item>device_personalization_services/NowPlaying__on_demand_hide_if_fingerprinter_install_not_confirmed=true</item>
         <item>device_personalization_services/NowPlaying__on_demand_min_supported_aga_version=12.35.17</item>
         <item>device_personalization_services/NowPlaying__on_demand_retry_fingerprinter_install=true</item>
-        <item>device_personalization_services/NowPlaying__shortcut_direct_create_enabled=false</item>
         <item>device_personalization_services/NowPlaying__youtube_export_enabled=true</item>
 
         <!-- Adaptive Sound (Pixel 2020) -->
@@ -120,13 +101,11 @@
         <item>device_personalization_services/Translate__differentiate_simplified_and_traditional_chinese=true</item>
         <item>device_personalization_services/Translate__disable_translate_without_system_animation=false</item>
         <item>device_personalization_services/Translate__enable_chronicle_migration=true</item>
-        <item>device_personalization_services/Translate__enable_default_langid_model=true</item>
+        <item>device_personalization_services/Translate__enable_default_langid_model=false</item>
         <item>device_personalization_services/Translate__enable_dictionary_langid_detection=true</item>
         <item>device_personalization_services/Translate__enable_opmv4_service=true</item>
-        <item>device_personalization_services/Translate__enable_settings_backup_restore=false</item>
         <item>device_personalization_services/Translate__enable_setup_wizard_dialog_v2=false</item>
         <item>device_personalization_services/Translate__enable_spa_setting=false</item>
-        <item>device_personalization_services/Translate__enable_translate_kit_api_migration=false</item>
         <item>device_personalization_services/Translate__interpreter_source_languages=de,en,ja,es,fr,it</item>
         <item>device_personalization_services/Translate__interpreter_target_languages=de,en,ja,es,fr,it</item>
         <item>device_personalization_services/Translate__replace_auto_translate_copied_text_enabled=true</item>

overlay/frameworks/base/core/res/res/values/config.xml

@@ -229,8 +229,8 @@
         <item>"/system_ext/priv-app/SystemUI/SystemUI.apk"</item>
     </string-array>
 
-    <!-- Bytes that the PinnerService will pin for Home app -->
-    <integer name="config_pinnerHomePinBytes">6291456</integer>
+    <!-- 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>
@@ -264,9 +264,6 @@
     <!-- Enable Zram writeback feature to allow unused pages in zram be written to flash. -->
     <bool name="config_zramWriteback">true</bool>
 
-    <!-- the number of the max cached processes in the system. -->
-    <integer name="config_customizedMaxCachedProcesses">1024</integer>
-
     <!-- List of system components which are allowed to receive ServiceState entries in an
          un-sanitized form, even if the location toggle is off. This is intended ONLY for system
          components, such as the telephony stack, which require access to the full ServiceState for

overlay/frameworks/base/packages/SettingsLib/res/values-mcc310-mnc004/strings.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Content description of the data connection type 5G UW. [CHAR LIMIT=NONE] -->
+    <string name="data_connection_5g_plus" translatable="false">5G UW</string>
+</resources>

overlay/frameworks/base/packages/SettingsLib/res/values-mcc311-mnc480/strings.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Content description of the data connection type 5G UW. [CHAR LIMIT=NONE] -->
+    <string name="data_connection_5g_plus" translatable="false">5G UW</string>
+</resources>

pixelstats/service.cpp

@@ -73,21 +73,18 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
             "/sys/class/power_supply/maxfg/gmsr",
             "/sys/class/power_supply/maxfg_base/gmsr",
         },
-        .FGModelLoadingPath = {
-            "/sys/class/power_supply/maxfg/m5_model_state"
-        },
-	.FGLogBufferPath = {
-            "/dev/logbuffer_maxfg_monitor",
-            "/dev/logbuffer_max77779fg_monitor",
-            "/dev/logbuffer_maxfg_base_monitor",
-            "/dev/logbuffer_maxfg_secondary_monitor"
-        }
 };
 
 const struct UeventListener::UeventPaths ueventPaths = {
         .AudioUevent = "/devices/virtual/amcs/amcs",
         .TypeCPartnerUevent = "PRODUCT_TYPE=",
-        .FwUpdatePath = ""
+        .FGLearningPath = {
+            "/sys/class/power_supply/maxfg/fg_learning_events"
+        },
+        .FwUpdatePath = "",
+        .FGModelLoadingPath = {
+            "/sys/class/power_supply/maxfg/m5_model_state"
+        }
 };
 
 int main() {

pkvm/pkvm_enabler.c

@@ -24,6 +24,7 @@
 
 #include <log/log.h>
 
+#define KVM_DEVICE  "/dev/kvm"
 #define MISC_WRITER "/vendor/bin/misc_writer"
 
 int main() {
@@ -32,7 +33,22 @@ int main() {
     pid_t pid;
     int ret, wstatus;
 
-    /* Run misc_writer and return FAILURE to force a reboot. */
+    /* Check whether KVM device exists. */
+    ret = access(KVM_DEVICE, F_OK);
+
+    /* If KVM device exists, return SUCCESS to continue booting. */
+    if (ret == 0) {
+        exit(EXIT_SUCCESS);
+    }
+
+    if (ret != -ENOENT) {
+        ALOGW("Unexpected error from access(): %d", ret);
+    }
+
+    /*
+     * If KVM device does not exist, run misc_writer and return FAILURE
+     * to force a reboot.
+     */
     pid = fork();
     if (pid == -1) {
         ALOGE("Could not fork: %d", errno);

pkvm/pkvm_enabler.gs101.rc

@@ -2,10 +2,5 @@ service pkvm_enabler /vendor/bin/pkvm_enabler
     reboot_on_failure reboot,pkvm-not-enabled
     user root
 
-# Old bootloaders do not set the protected_vm sysprop when pkvm is disabled
-on early-init && property:ro.boot.hypervisor.protected_vm.supported=
-    exec_start pkvm_enabler
-
-# New bootloaders set the protected_vm sysprop to 0 when pkvm is disabled
-on early-init && property:ro.boot.hypervisor.protected_vm.supported=0
+on early-init
     exec_start pkvm_enabler

powerhint_a1.json

@@ -369,6 +369,18 @@
       "Type": "EndHint",
       "Value": "DISABLE_TA_BOOST"
     },
+    {
+      "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
+      "Node": "LimitFlashCurrent",
+      "Duration": 0,
+      "Value": "100"
+    },
+    {
+      "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
+      "Node": "LimitFlashCurrent",
+      "Duration": 0,
+      "Value": "1500"
+    },
     {
       "PowerHint": "EXPENSIVE_RENDERING",
       "Node": "PowerHALRenderingState",

powerstats/Gs101CommonDataProviders.cpp

@@ -343,7 +343,7 @@ void addSoC(std::shared_ptr<PowerStats> p) {
 }
 
 void setEnergyMeter(std::shared_ptr<PowerStats> p) {
-    std::vector<std::string> deviceNames { "s2mpg10-odpm", "s2mpg11-odpm" };
+    std::vector<const std::string> deviceNames { "s2mpg10-odpm", "s2mpg11-odpm" };
     p->setEnergyMeterDataProvider(std::make_unique<IioEnergyMeterDataProvider>(deviceNames, true));
 }
 

rro_overlays/TetheringOverlay/Android.bp

@@ -1,9 +0,0 @@
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-runtime_resource_overlay {
-    name: "TetheringOverlay",
-    sdk_version: "current",
-    product_specific: true
-}

rro_overlays/TetheringOverlay/AndroidManifest.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-<!-- Pixel specific tethering overlays -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.networkstack.tethering.overlay"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <application android:hasCode="false" />
-    <overlay
-        android:targetPackage="com.android.networkstack.tethering"
-        android:targetName="TetheringConfig"
-        android:isStatic="true"
-        android:priority="0" />
-</manifest>

rro_overlays/TetheringOverlay/res/values/config.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * 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.
- */
--->
-<resources>
-    <!-- List of regexpressions describing the interface (if any) that represent tetherable
-         USB interfaces.  If the device doesn't want to support tethering over USB this should
-         be empty.  An example would be "usb.*" -->
-    <string-array translatable="false" name="config_tether_usb_regexs">
-        <item>rndis\\d</item>
-    </string-array>
-
-    <!-- List of regexpressions describing the interface (if any) that represent tetherable
-         NCM interfaces.  If the device doesn't want to support tethering over NCM this should
-         be empty. -->
-    <string-array translatable="false" name="config_tether_ncm_regexs">
-        <item>ncm\\d</item>
-    </string-array>
-
-    <!-- List of regexpressions describing the interface (if any) that represent tetherable
-         Wifi P2P interfaces.  If the device doesn't want to support tethering over Wifi P2p this
-         should be empty.  An example would be "p2p-p2p\\d-.*" -->
-    <string-array translatable="false" name="config_tether_wifi_p2p_regexs">
-        <item>p2p-p2p\\d-.*</item>
-        <item>p2p\\d</item>
-        <item>p2p-wlan\\d-.*</item>
-    </string-array>
-
-    <!-- Which USB function should be enabled when TETHERING_USB is requested. 0: RNDIS, 1: NCM.
-         -->
-    <integer translatable="false" name="config_tether_usb_functions">1</integer>
-</resources>

rro_overlays/WifiOverlay/res/values/config.xml

@@ -161,12 +161,4 @@
          If equals to 0, it means there's no limit on the max number of channels to include per network.-->
     <integer translatable="false" name="config_wifiInitialPartialScanMaxNewChannelsPerNetwork">3</integer>
 
-    <!-- Boolean indicating whether to disable firmware roaming when the device goes into idle mode.
-         true: firmware roaming will be disabled when the device goes into idle mode, and then
-               re-activated when the device exits idle mode.
-         false: firmware roaming will not be affected. -->
-    <bool translatable="false" name ="config_wifiDisableFirmwareRoamingInIdleMode">true</bool>
-
-    <!-- Boolean indicating whether to trigger bugreport for WiFi subsystem restart issue -->
-    <bool translatable="false" name ="config_wifi_subsystem_restart_bugreport_enabled">false</bool>
 </resources>

sepolicy/display/gs101/genfs_contexts

@@ -2,14 +2,12 @@ genfscon sysfs /devices/platform/1c2c0000.drmdsim/1c2c0000.drmdsim.0/backlight
 genfscon sysfs /devices/platform/1c2c0000.drmdsim/1c2c0000.drmdsim.0/panel_name                u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/1c2c0000.drmdsim/1c2c0000.drmdsim.0/serial_number             u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/1c2c0000.drmdsim/1c2c0000.drmdsim.0/refresh_rate              u:object_r:sysfs_display:s0
-genfscon sysfs /devices/platform/1c2c0000.drmdsim/1c2c0000.drmdsim.0/power_state               u:object_r:sysfs_display:s0
 genfscon sysfs /firmware/devicetree/base/drmdsim@0x1C2C0000/panel@0/compatible                 u:object_r:sysfs_display:s0
 
 genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/backlight                 u:object_r:sysfs_leds:s0
 genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/panel_name                u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/serial_number             u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/refresh_rate              u:object_r:sysfs_display:s0
-genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/power_state               u:object_r:sysfs_display:s0
 genfscon sysfs /firmware/devicetree/base/drmdsim@0x1C2D0000/panel@0/compatible                 u:object_r:sysfs_display:s0
 
 genfscon sysfs /module/drm/parameters/vblankoffdelay                                           u:object_r:sysfs_display:s0

sepolicy/gs101-sepolicy.mk

@@ -1,6 +1,9 @@
 # ConnectivityThermalPowerManager
 BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/connectivity_thermal_power_manager
 
+# ramdump
+BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/ramdump
+
 # twoshay
 BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/input
 
@@ -8,7 +11,7 @@ BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/input
 BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/googlebattery
 
 # sepolicy that are shared among devices using whitechapel
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101/sepolicy/whitechapel/vendor/google
+BOARD_SEPOLICY_DIRS += device/google/gs101/sepolicy/whitechapel/vendor/google
 
 # unresolved SELinux error log with bug tracking
 BOARD_SEPOLICY_DIRS += device/google/gs101/sepolicy/tracking_denials
@@ -29,6 +32,9 @@ SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/gs101/sepolicy/system_ext/priv
 #   PowerStats HAL
 BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/powerstats
 
+# sscoredump
+BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/sscoredump
+
 # Public
 PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/gs101/sepolicy/public
 

sepolicy/oriole-sepolicy.mk

@@ -1,5 +1,2 @@
 # Oriole only sepolicy
-BOARD_SEPOLICY_DIRS += device/google/gs101/sepolicy/oriole
-
-BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/vibrator/common
-BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/vibrator/cs40l25
+BOARD_SEPOLICY_DIRS += device/google/gs101-sepolicy/oriole

sepolicy/raven-sepolicy.mk

@@ -1,5 +1,2 @@
 # Ravne only sepolicy
-BOARD_SEPOLICY_DIRS += device/google/gs101/sepolicy/raven
-
-BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/vibrator/common
-BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/vibrator/cs40l25
+BOARD_SEPOLICY_DIRS += device/google/gs101-sepolicy/raven

sepolicy/system_ext/private/pixelntnservice_app.te

@@ -1,5 +0,0 @@
-typeattribute pixelntnservice_app coredomain;
-
-app_domain(pixelntnservice_app);
-allow pixelntnservice_app app_api_service:service_manager find;
-set_prop(pixelntnservice_app, telephony_modem_prop)

sepolicy/system_ext/private/property_contexts

@@ -5,5 +5,4 @@ persist.fingerprint.ghbm    u:object_r:fingerprint_ghbm_prop:s0    exact    bool
 persist.modem.esim_profiles_exist            u:object_r:esim_modem_prop:s0    exact    string
 
 # Telephony
-telephony.TnNtn.image_switch u:object_r:telephony_modem_prop:s0    exact enum ntn tn
 telephony.ril.silent_reset    u:object_r:telephony_ril_prop:s0    exact    bool

sepolicy/system_ext/private/seapp_contexts

@@ -6,6 +6,3 @@ user=_app isPrivApp=true seinfo=platform name=com.google.android.connectivitymon
 
 # HbmSVManager
 user=_app seinfo=platform name=com.android.hbmsvmanager domain=hbmsvmanager_app type=app_data_file levelFrom=all
-
-# PixelNtnService
-user=system seinfo=platform name=com.google.android.satellite domain=pixelntnservice_app type=app_data_file levelFrom=all

sepolicy/system_ext/public/pixelntnservice_app.te

@@ -1 +0,0 @@
-type pixelntnservice_app, domain;

sepolicy/system_ext/public/property.te

@@ -6,8 +6,7 @@ system_vendor_config_prop(esim_modem_prop)
 
 # Telephony
 system_public_prop(telephony_ril_prop)
-system_restricted_prop(telephony_modem_prop)
 
 userdebug_or_eng(`
   set_prop(shell, telephony_ril_prop)
-')
+')

sepolicy/tracking_denials/bluetooth.te

@@ -1,2 +0,0 @@
-# b/382362462
-dontaudit bluetooth default_android_service:service_manager { find };

sepolicy/tracking_denials/bug_map

@@ -1,50 +1,18 @@
-
-battery_mitigation sysfs file b/364446534
-bluetooth audio_config_prop file b/379226761
-bluetooth audio_config_prop file b/379245675
 chre vendor_data_file dir b/301948771
-dump_display sysfs file b/340722772
-dump_modem sscoredump_vendor_data_coredump_file dir b/366115873
-dump_modem sscoredump_vendor_data_logcat_file dir b/366115873
-hal_camera_default aconfig_storage_metadata_file dir b/383013727
+dumpstate virtual_camera binder b/312894628
+dumpstate virtual_camera process b/312894628
 hal_power_default hal_power_default capability b/240632824
-hal_sensors_default sysfs file b/340723303
+hal_vibrator_default default_android_service service_manager b/317316478
 incidentd debugfs_wakeup_sources file b/282626428
 incidentd incidentd anon_inode b/282626428
-init init capability b/379591559
 kernel dm_device blk_file b/315907959
-kernel kernel capability b/340722537
-kernel kernel capability b/340723030
 kernel tmpfs chr_file b/315907959
-modem_svc_sit hal_radioext_default process b/372348067
-pixelstats_vendor block_device dir b/369537606
-pixelstats_vendor block_device dir b/369735407
-platform_app vendor_fw_file dir b/372122654
-platform_app vendor_rild_prop file b/372122654
-priv_app audio_config_prop file b/379226710
-priv_app audio_config_prop file b/379246066
-radio audio_config_prop file b/379227275
-ramdump ramdump capability b/369538457
 rfsd vendor_cbd_prop file b/317734418
-shell sysfs_net file b/329380904
-ssr_detector_app default_prop file b/350831964
 surfaceflinger selinuxfs file b/313804340
-system_server vendor_default_prop file b/366115457
-system_server vendor_default_prop file b/366116435
-system_server vendor_default_prop file b/366116587
-untrusted_app audio_config_prop file b/379226644
-untrusted_app audio_config_prop file b/379246340
 untrusted_app nativetest_data_file dir b/305600845
 untrusted_app shell_test_data_file dir b/305600845
 untrusted_app system_data_root_file dir b/305600845
 untrusted_app userdebug_or_eng_prop file b/305600845
-untrusted_app_29 audio_config_prop file b/379246143
-vendor_init debugfs_trace_marker file b/340723222
 vendor_init default_prop file b/315104713
 vendor_init default_prop file b/316817111
 vendor_init default_prop property_service b/315104713
-vendor_init default_prop property_service b/366115458
-vendor_init default_prop property_service b/366116214
-vendor_init default_prop property_service b/369735133
-vendor_init default_prop property_service b/369735170
-zygote zygote capability b/379591519

sepolicy/whitechapel/vendor/google/cbd.te

@@ -5,7 +5,6 @@ init_daemon_domain(cbd)
 set_prop(cbd, vendor_modem_prop)
 set_prop(cbd, vendor_cbd_prop)
 set_prop(cbd, vendor_rild_prop)
-get_prop(cbd, telephony_modem_prop)
 
 # Allow cbd to setuid from root to radio
 # TODO: confirming with vendor via b/182334947

sepolicy/whitechapel/vendor/google/certs/EuiccSupportPixel.x509.pem

@@ -1,28 +1,33 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----

sepolicy/whitechapel/vendor/google/certs/com_google_android_apps_camera_services.x509.pem

@@ -1,28 +1,30 @@
------BEGIN CERTIFICATE-----
-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
------END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIGCzCCA/OgAwIBAgIVAIHtywgrR7O/EgQ+PeYSfHDaUDt8MA0GCSqGSIb3DQEBCwUAMIGUMQsw
+CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEU
+MBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxMDAuBgNVBAMMJ2NvbV9nb29n
+bGVfYW5kcm9pZF9hcHBzX2NhbWVyYV9zZXJ2aWNlczAgFw0yMTA2MzAyMzI2MThaGA8yMDUxMDYz
+MDIzMjYxOFowgZQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1N
+b3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEwMC4G
+A1UEAwwnY29tX2dvb2dsZV9hbmRyb2lkX2FwcHNfY2FtZXJhX3NlcnZpY2VzMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEAof2MqYxoQkV05oUZULYlNLDIJKryWjC8ha300YUktBNNVBSP
+1y33+ZTBldm7drcBGo54S1JE1lCIP1dMxby0rNTJ8/Zv2bMVMjXX0haF5vULt64itDcR0SqUDfFR
+UsHapPVmRmMpDOMOUYUbN7gjU7iYAc9oWBo6BFfckdpwwKfzYY/sgieen1E/MN7Zpzmefct3WDU5
+4Dc8mpoNsen3oqquieYAgv9FOw5gCIgsDaOfYFBgvAE08Pqo3J/zU6dAuqUJztNH8EhgTNbcaNVL
+jCmofa+iIAjSpmP69jcgaUyfmH0EE3/m55qouVRJzqARvmEO/M7LEr3n1ZKKhDZdO6TJysMzP9g8
+pONPO8/3hTQ+GP+7fOQooNQJEGNgJuZOHSyNL/8nGCgHBZKgZdZPKk8HV2M578UDf8yNyV5AYpx0
+VK1JdoBtNMzp0cv7Q6TTugIuDEzT3jmgGGp6WmXE6B9dJOq+cnVC7cSYva8wctFS3RpoqT79vkW3
+A7g2b26bM5GMQ8KcGC4qm4pJkrX5kKZWZGWXjm0F8gRJQ5D0S/AcUw3B+sG/AmfQzLm8SCK36HhO
+sFnPsQJ/VdL7kg9HHWrQYVexNaQnD/QLOCenk09COUzSwexws+kQhUH45OSbQFjOJwPbS4YAn9qV
+eV+DPlvemZEFYF5+MVlDwOGQ3JsCAwEAAaNQME4wDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUtjMO
+nlaC4nsk4PwT+fcIYpg52JQwHwYDVR0jBBgwFoAUtjMOnlaC4nsk4PwT+fcIYpg52JQwDQYJKoZI
+hvcNAQELBQADggIBABhYDqPD2yWiXNCVtHk6h7Kb2H2U3rc8G7Or1/mwrXSCEgqHnCkpiWeb1h/5
+YNS9fRrexQD+O0hukCpjvIFccQvk8EkZdWpn4kDlrUqfakWpASzlwEqRviS31Hiybn/+QUpYuDTm
+FYorrHzDzPiNttzxVK0ENt4T4ETDWVqiGB7tbTlLPr6tz/oxDjRH8y4iS/For7SkfdI512txJgDr
+njvRVY9WJykySs+AAqwS1PIMXGoI03UmLJUsFNUjHehaqguPS1uiewlKiQq07blWbnQXdcyH7QTI
+hOUPY2rRBh8ciXu4L0Uk4To7+DP/8nHSGC7qXPvP6W3gqW1hj0d6GviMEfJ9fBSUEzaCRF3aL/5e
+JOGQQKxh7Jsl/zZs4+MYg0Q2cyg/BQVNNOhESG4et4OV5go9W+1oAy20FV0NgtdPoeb9ABNoi4T3
+IrKLgxOsbACpoDt3zPhncqiJhX3feFtyVV4oRiylydiiYO927qNdfMGmcnGFSG4814kUxSdpkoCA
+V7WCQD42zfBYj4pkdZwiJW4yZSaPWN/Eodi3PBsV+10Y1O1WOvebJuTGmcvWWMCPGtFQJDijUy4H
+r8rDe3ZmRGQ+vEGPJZC8nx9+qxLQ314ZCzdS0R1HwRRuOji3fCSCnaPQuCFe3YlzhB2j6fRGNf7F
+DB17LhMLl0GxX9j1
+-----END CERTIFICATE-----

sepolicy/whitechapel/vendor/google/certs/com_google_mds.x509.pem

@@ -1,28 +1,29 @@
 -----BEGIN CERTIFICATE-----
-MIIF1TCCA72gAwIBAgIVAPZ4KZV2jpxRBCoVAidCu62l3cDqMA0GCSqGSIb3DQEBCwUAMHsxCzAJB
-gNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEg
-YDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEXMBUGA1UEAwwOY29tX2dvb2dsZV9
-tZHMwHhcNMTkwNDIyMTQ1NzA1WhcNNDkwNDIyMTQ1NzA1WjB7MQswCQYDVQQGEwJVUzETMBEGA1UE
-CBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluY
-y4xEDAOBgNVBAsTB0FuZHJvaWQxFzAVBgNVBAMMDmNvbV9nb29nbGVfbWRzMIICIjANBgkqhkiG9w
-0BAQEFAAOCAg8AMIICCgKCAgEAqgNC0hhI3NzaPUllJfe01hCTuEpl35D02+DKJ5prPFxv6KGTk6s
-kjZOwV87Zf2pyj/cbnv28ioDjwvqMBe4ntFdKtH9gl2tTAVl69HMKXF4Iny/wnrt2mxzhWxFUd5Pu
-W+mWug+UQw/NGUuaf5d/yys/RrchHKM1+zBV6aOzH6BXiwDoOF2i43d5GlNQ/tFuMySWLJftJN0QU
-LFelxNDFFJZhw2P3c4opxjmF2yCoIiDfBEIhTZFKUbHX6YDLXmtUpXl35q+cxK4TCxPURyzwdfiyh
-eF3TTxagfzhvXNg/ifrY67S4qCGfzoEMPxrTz02gS0u3D6r/2+hl9vAJChLKDNdIs6TqIw+YnABrE
-LiZLLFnaABnjQ7xC3xv1s3W6dWxaxnoVMtC1YvdgwhC5gSpJ4A+AGcCLv96hoeB1IIoGV9Yt0Z97M
-FpXeHFpAxFZ1F9feBqwOCDbu50dmdKZvqGHZ4Ts3uy7ukDQ08dquHpT+NmqkmmW5GGhkuyZS3HHpU
-/QeVsZiyJCJBbDe5lz6NGXK56ruuF9ILeGHtldjQm40oYRc01ESScyVjSU0kpMOC7hn1B7rKAm8xx
-G7eH04ieQrNnbbee7atOO4C3157W5CqujfLMeo6OCRVtcYkYIuSi8hIPNySu/qOaEtEP4owVNZR0H
-6mCHy5pANsyBofMkCAwEAAaNQME4wDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUgk8pmLx8yP3RILwR
-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
+MIIFxjCCA66gAwIBAgIUHaTgvNgfCuCnEGvjMtysCgoCclIwDQYJKoZIhvcNAQELBQAwdDELMAkG
+A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDAS
+BgNVBAoTC0dvb2dsZSBJbmMuMRAwDgYDVQQLEwdBbmRyb2lkMRAwDgYDVQQDEwdBbmRyb2lkMB4X
+DTE5MDQyMjE0NTcwNVoXDTQ5MDQyMjE0NTcwNVowdDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNh
+bGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC0dvb2dsZSBJbmMuMRAw
+DgYDVQQLEwdBbmRyb2lkMRAwDgYDVQQDEwdBbmRyb2lkMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAwrx6YQqIIvZEULv/1AAF8HR4t0kPnZsgGwoR3SrumpGCNRPjAN8yztJi6fdNZSLn
+lj7giXZm16lDTWQ+/bKwuDof5adaRuE7nrf2oVTzRQ3Z1XFcw0400mQ0EHZYTBV6wgl9/K4zepIi
+/149Vyy0ynkiB3kmZYCDS6VfOvHHyqxxuKlwF2ry0YILGo3PwaNDiONizpq2RtLNIYseyK6ow5QH
+wHtL81n8bc3bIbwJjrKnCef2WDEy8ZaVMyLIYZwYZ3rw4MLQVF5Pqy93RKMfz7ZzJaERlwWsqz01
+2Ae1QpP82MBQVMoAUhjFKO3XAlD1592nx1zNzf5kpwGhTEpSWrnVS3UUW3ISBactM/fihmjOot5S
+UXidLa0W2FvJuLDn0XL7TnwLU8MOekesKKQQa17ESEGTpSlJP3nw/xccbaYAzXof6yRJ3iJnNsGG
+2njAxC9XqxwaaV4PsomfFueqgx0u3wQsPWskTbRgLQK3z/V8+hoTxsrZ4VE23DZ3z4vz4CXn/1Iz
+up7Gceun4cBqEYz+leVsc3ML28dsbOmoju910uOeCH28D6aDHRKzsGClj09bUeL/ZpStLEPA1AU+
+Nju2Y7rQI1T0l7tWIhKq5W6pPPpZcePNNflLvF72gudEa5v/PQGjWmElXOEMmzpRhqZovaDbcpej
+CWu11DeYtfkCAwEAAaNQME4wDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUEdfzOO0hHPuLPlpdLAtl
+gtAUNckwHwYDVR0jBBgwFoAUEdfzOO0hHPuLPlpdLAtlgtAUNckwDQYJKoZIhvcNAQELBQADggIB
+AHUv2QmPiuvFHmroIn0GztonAEKcHYENCKvC7nDGrj7MedD46Fn7mC1Nej2yuXM8KOkpjapjOA9o
+4ggV75R28HDkHP3Ies1xK1TejPGekxfvvLP+RmWFJPiuKaVhwn78BM4IWSSqKA3vh/pZH+OqK8kO
+HK1BpFkwvlyira025XGnCPWzBNij9pMqioUpGjz3Pp7cw2iPY1tTlcmYXsCns7AbZ9Z3YNav7Zx6
+jku9aJRsdAtW3tfKi4rmuh0VAYVmlp4BmcVkmRKozYn8QKyB/PAhGbDAnIwDzoHsrFvwxpKwMJJs
+JFVumvh9JrGq0YvY6R52DzA7+KvWkAMe22JXW70EhSZ8QD5t7WphZ683Hpjf5fWpWXcU/fUqkihi
+HPy9ogiNlJ5hYaDMbkKyA2vzsagJorK4V1pXg3gk7D96MOE5wFSROd/WQit8W+4ApkF3DOIjyCEC
+KHAZVkcp8nx//hs50GoirtUhLpj4PcYHUg6I2c+Gx/krSOQD/fxuC7PWxE5whIZRBaXIkHWALufR
+e7eeFI9peEu/nvn/MjNXyVoUbuQ3Ja4QFt+Ku7+KU+numH8ajBCzaPeu6bxosVNXyiDAxDI+Tfuk
+jn37lHw/TQ8athakHqhxg63+nwsbnkyd0S1qPG38ocHqLliPBVz8nntcmUR1PdeFZpvGGlD83sJV
+
 -----END CERTIFICATE-----

sepolicy/whitechapel/vendor/google/device.te

@@ -1,5 +1,8 @@
 # Block Devices
+type efs_block_device, dev_type;
 type modem_block_device, dev_type;
+type modem_userdata_block_device, dev_type;
+type persist_block_device, dev_type;
 type mfg_data_block_device, dev_type;
 
 # Exynos devices
@@ -36,4 +39,3 @@ type st33spi_device, dev_type;
 
 # GPS
 type vendor_gnss_device, dev_type;
-

sepolicy/whitechapel/vendor/google/dump_power.te

@@ -1,24 +0,0 @@
-# Allow dumpstate to execute dump_power
-pixel_bugreport(dump_power);
-
-allow dump_power sysfs_acpm_stats:dir r_dir_perms;
-allow dump_power sysfs_acpm_stats:file r_file_perms;
-allow dump_power sysfs_cpu:file r_file_perms;
-allow dump_power sysfs_wlc:file r_file_perms;
-allow dump_power sysfs_wlc:dir search;
-allow dump_power sysfs_batteryinfo:dir r_dir_perms;
-allow dump_power sysfs_batteryinfo:file r_file_perms;
-allow dump_power logbuffer_device:chr_file r_file_perms;
-allow dump_power mitigation_vendor_data_file:dir r_dir_perms;
-allow dump_power mitigation_vendor_data_file:file r_file_perms;
-allow dump_power sysfs_bcl:dir r_dir_perms;
-allow dump_power sysfs_bcl:file r_file_perms;
-
-userdebug_or_eng(`
-  r_dir_file(dump_power, vendor_battery_debugfs)
-  r_dir_file(dump_power, vendor_maxfg_debugfs)
-  r_dir_file(dump_power, vendor_charger_debugfs)
-  r_dir_file(dump_power, vendor_votable_debugfs)
-  allow dump_power debugfs:dir r_dir_perms;
-  allow dump_power vendor_usb_debugfs:dir { search };
-')

sepolicy/whitechapel/vendor/google/file.te

@@ -114,6 +114,10 @@ type sysfs_chargelevel, sysfs_type, fs_type;
 
 # ODPM
 type powerstats_vendor_data_file, file_type, data_file_type;
+type sysfs_odpm, sysfs_type, fs_type;
+
+# bcl
+type sysfs_bcl, sysfs_type, fs_type;
 
 # Chosen
 type sysfs_chosen, sysfs_type, fs_type;
@@ -161,4 +165,3 @@ type sysfs_bootctl, sysfs_type, fs_type;
 
 # WLC
 type sysfs_wlc, sysfs_type, fs_type;
-

sepolicy/whitechapel/vendor/google/file_contexts

@@ -16,7 +16,8 @@
 /(vendor|system/vendor)/lib(64)?/libgpudataproducer\.so                                         u:object_r:same_process_hal_file:s0
 
 /vendor/bin/dumpsys                                                                             u:object_r:vendor_dumpsys:s0
-/vendor/bin/dump/dump_power                                                                     u:object_r:dump_power_exec:s0
+/vendor/bin/dump/dump_gs101.sh                                                                  u:object_r:dump_gs101_exec:s0
+
 #
 # HALs
 #
@@ -167,7 +168,7 @@
 /vendor/lib(64)?/libGralloc4Wrapper\.so                                 u:object_r:same_process_hal_file:s0
 /vendor/lib(64)?/pixel-power-ext-V1-ndk\.so                             u:object_r:same_process_hal_file:s0
 
-/dev/ispolin_ranging                                                    u:object_r:rls_device:s0
+/dev/stmvl53l1_ranging                                                  u:object_r:rls_device:s0
 
 /dev/lwis-act0                                                          u:object_r:lwis_device:s0
 /dev/lwis-act1                                                          u:object_r:lwis_device:s0
@@ -245,7 +246,8 @@
 # TCP logging
 /vendor/bin/tcpdump_logger          u:object_r:tcpdump_logger_exec:s0
 
-# shared_modem_platform files
+# modem_svc_sit files
+/vendor/bin/modem_svc_sit           u:object_r:modem_svc_sit_exec:s0
 /data/vendor/modem_stat(/.*)?       u:object_r:modem_stat_data_file:s0
 
 # modem mnt files
@@ -361,7 +363,6 @@
 
 # Fingerprint
 /dev/goodix_fp                                                                 u:object_r:fingerprint_device:s0
-/data/vendor/fingerprint(/.*)?                                                 u:object_r:fingerprint_vendor_data_file:s0
 
 # Wifi Firmware config update
 /data/vendor/firmware/wifi(/.*)?                                               u:object_r:updated_wifi_firmware_data_file:s0
@@ -372,6 +373,5 @@
 
 # Statsd service to support EdgeTPU metrics logging service.
 /vendor/lib64/android\.frameworks\.stats-V1-ndk\.so u:object_r:same_process_hal_file:s0
-/vendor/lib64/android\.frameworks\.stats-V2-ndk\.so u:object_r:same_process_hal_file:s0
 /vendor/lib64/vendor-pixelatoms-cpp\.so u:object_r:same_process_hal_file:s0
 /vendor/lib64/libprotobuf-cpp-lite-(\d+\.){2,3}so u:object_r:same_process_hal_file:s0

sepolicy/whitechapel/vendor/google/genfs_contexts

@@ -152,8 +152,6 @@ genfscon sysfs /devices/platform/1c2c0000.drmdsim/1c2c0000.drmdsim.0/panel_need_
 genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/panel_need_handle_idle_exit    u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/1c2c0000.drmdsim/1c2c0000.drmdsim.0/time_in_state                  u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/time_in_state                  u:object_r:sysfs_display:s0
-genfscon sysfs /devices/platform/1c2c0000.drmdsim/1c2c0000.drmdsim.0/power_mode                     u:object_r:sysfs_display:s0
-genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/power_mode                     u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/1c2c0000.drmdsim/hs_clock                                          u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/1c2d0000.drmdsim/hs_clock                                          u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/1c300000.drmdecon/counters                                         u:object_r:sysfs_display:s0
@@ -187,38 +185,14 @@ genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-21/21-002f/s2mpg11-me
 genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-21/21-002f/s2mpg11-meter/s2mpg11-odpm/iio:device0/enabled_rails        u:object_r:sysfs_odpm:s0
 genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-21/21-002f/s2mpg11-meter/s2mpg11-odpm/wakeup                           u:object_r:sysfs_wakeup:s0
 
-genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-20/20-001f/s2mpg10-meter/s2mpg10-odpm/iio:device0/in_power0_scale    u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-20/20-001f/s2mpg10-meter/s2mpg10-odpm/iio:device0/in_power1_scale    u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-20/20-001f/s2mpg10-meter/s2mpg10-odpm/iio:device0/in_power2_scale    u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-20/20-001f/s2mpg10-meter/s2mpg10-odpm/iio:device0/in_power3_scale    u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-20/20-001f/s2mpg10-meter/s2mpg10-odpm/iio:device0/in_power4_scale    u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-20/20-001f/s2mpg10-meter/s2mpg10-odpm/iio:device0/in_power5_scale    u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-20/20-001f/s2mpg10-meter/s2mpg10-odpm/iio:device0/in_power6_scale    u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-20/20-001f/s2mpg10-meter/s2mpg10-odpm/iio:device0/in_power7_scale    u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-21/21-002f/s2mpg11-meter/s2mpg11-odpm/iio:device1/in_power0_scale    u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-21/21-002f/s2mpg11-meter/s2mpg11-odpm/iio:device1/in_power1_scale    u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-21/21-002f/s2mpg11-meter/s2mpg11-odpm/iio:device1/in_power2_scale    u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-21/21-002f/s2mpg11-meter/s2mpg11-odpm/iio:device1/in_power3_scale    u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-21/21-002f/s2mpg11-meter/s2mpg11-odpm/iio:device1/in_power4_scale    u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-21/21-002f/s2mpg11-meter/s2mpg11-odpm/iio:device1/in_power5_scale    u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-21/21-002f/s2mpg11-meter/s2mpg11-odpm/iio:device1/in_power6_scale    u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-21/21-002f/s2mpg11-meter/s2mpg11-odpm/iio:device1/in_power7_scale    u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-20/20-001f/s2mpg10-meter/s2mpg10-odpm/iio:device0/in_current0_scale  u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-20/20-001f/s2mpg10-meter/s2mpg10-odpm/iio:device0/in_current1_scale  u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-20/20-001f/s2mpg10-meter/s2mpg10-odpm/iio:device0/in_current2_scale  u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-20/20-001f/s2mpg10-meter/s2mpg10-odpm/iio:device0/in_current3_scale  u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-20/20-001f/s2mpg10-meter/s2mpg10-odpm/iio:device0/in_current4_scale  u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-20/20-001f/s2mpg10-meter/s2mpg10-odpm/iio:device0/in_current5_scale  u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-20/20-001f/s2mpg10-meter/s2mpg10-odpm/iio:device0/in_current6_scale  u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-20/20-001f/s2mpg10-meter/s2mpg10-odpm/iio:device0/in_current7_scale  u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-21/21-002f/s2mpg11-meter/s2mpg11-odpm/iio:device1/in_current0_scale  u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-21/21-002f/s2mpg11-meter/s2mpg11-odpm/iio:device1/in_current1_scale  u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-21/21-002f/s2mpg11-meter/s2mpg11-odpm/iio:device1/in_current2_scale  u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-21/21-002f/s2mpg11-meter/s2mpg11-odpm/iio:device1/in_current3_scale  u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-21/21-002f/s2mpg11-meter/s2mpg11-odpm/iio:device1/in_current4_scale  u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-21/21-002f/s2mpg11-meter/s2mpg11-odpm/iio:device1/in_current5_scale  u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-21/21-002f/s2mpg11-meter/s2mpg11-odpm/iio:device1/in_current6_scale  u:object_r:sysfs_odpm:s0
-genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-21/21-002f/s2mpg11-meter/s2mpg11-odpm/iio:device1/in_current7_scale  u:object_r:sysfs_odpm:s0
+# bcl sysfs files
+genfscon sysfs /devices/virtual/pmic/mitigation                                        u:object_r:sysfs_bcl:s0
+genfscon sysfs /devices/virtual/pmic/mitigation/clock_ratio/tpu_heavy_clk_ratio        u:object_r:sysfs_bcl:s0
+genfscon sysfs /devices/virtual/pmic/mitigation/clock_ratio/gpu_heavy_clk_ratio        u:object_r:sysfs_bcl:s0
+genfscon sysfs /devices/virtual/pmic/mitigation/clock_ratio/cpu2_heavy_clk_ratio       u:object_r:sysfs_bcl:s0
+genfscon sysfs /devices/virtual/pmic/mitigation/clock_ratio/cpu2_light_clk_ratio       u:object_r:sysfs_bcl:s0
+genfscon sysfs /devices/virtual/pmic/mitigation/clock_ratio/tpu_light_clk_ratio        u:object_r:sysfs_bcl:s0
+genfscon sysfs /devices/virtual/pmic/mitigation/clock_ratio/gpu_light_clk_ratio        u:object_r:sysfs_bcl:s0
 
 # Chosen
 genfscon sysfs /firmware/devicetree/base/chosen                                u:object_r:sysfs_chosen:s0
@@ -261,7 +235,6 @@ genfscon sysfs /devices/platform/1c500000.mali/dma_buf_gpu_mem
 genfscon sysfs /devices/platform/1c500000.mali/total_gpu_mem                                            u:object_r:sysfs_gpu:s0
 genfscon sysfs /devices/platform/1c500000.mali/kprcs                                                    u:object_r:sysfs_gpu:s0
 genfscon sysfs /devices/platform/1c500000.mali/power_policy                                             u:object_r:sysfs_gpu:s0
-genfscon sysfs /devices/platform/1c500000.mali/cur_freq                                                 u:object_r:sysfs_gpu:s0
 
 # nvmem (Non Volatile Memory layer)
 genfscon sysfs /devices/platform/10970000.hsi2c/i2c-8/8-0050/8-00500/nvmem                              u:object_r:sysfs_memory:s0

sepolicy/whitechapel/vendor/google/hal_camera_default.te

@@ -91,7 +91,6 @@ allow hal_camera_default sysfs_devfreq_cur:file r_file_perms;
 # Allow camera HAL to read backlight of display
 allow hal_camera_default sysfs_leds:dir r_dir_perms;
 allow hal_camera_default sysfs_leds:file r_file_perms;
-allow hal_camera_default sysfs_display:file r_file_perms;
 
 # Allow camera HAL to query interrupts and set interrupt affinity
 allow hal_camera_default proc_irq:dir r_dir_perms;

sepolicy/whitechapel/vendor/google/hal_radioext_default.te

@@ -4,7 +4,6 @@ init_daemon_domain(hal_radioext_default)
 
 hwbinder_use(hal_radioext_default)
 get_prop(hal_radioext_default, hwservicemanager_prop)
-set_prop(hal_radioext_default, vendor_gril_prop)
 add_hwservice(hal_radioext_default, hal_radioext_hwservice)
 
 binder_call(hal_radioext_default, grilservice_app)

sepolicy/whitechapel/vendor/google/hwservice_contexts

@@ -11,6 +11,7 @@ android.vendor.samsung_slsi.telephony.hardware.radio::IOemSamsungslsi        u:o
 vendor.samsung_slsi.telephony.hardware.radioExternal::IOemSlsiRadioExternal        u:object_r:hal_exynos_rild_hwservice:s0
 
 # VIDEO
+android.hardware.media.c2::IComponentStore                      u:object_r:hal_codec2_hwservice:s0
 android.hardware.media.c2::IConfigurable                        u:object_r:hal_codec2_hwservice:s0
 
 # GRIL HAL

sepolicy/whitechapel/vendor/google/kernel.te

@@ -8,11 +8,7 @@ allow kernel per_boot_file:file r_file_perms;
 allow kernel self:capability2 perfmon;
 allow kernel self:perf_event cpu;
 
-userdebug_or_eng(`
-  allow kernel vendor_battery_debugfs:dir search;
-  allow kernel vendor_regmap_debugfs:dir search;
-  allow kernel vendor_usb_debugfs:dir search;
-  allow kernel vendor_votable_debugfs:dir search;
-  allow kernel vendor_charger_debugfs:dir search;
-  allow kernel vendor_maxfg_debugfs:dir search;
-')
+dontaudit kernel vendor_battery_debugfs:dir search;
+dontaudit kernel vendor_maxfg_debugfs:dir { search };
+dontaudit kernel vendor_votable_debugfs:dir { search };
+dontaudit kernel vendor_usb_debugfs:dir search;

sepolicy/whitechapel/vendor/google/modem_svc_sit.te

@@ -1,4 +1,3 @@
-# Selinux rule for modem_svc_sit daemon
 type modem_svc_sit, domain;
 type modem_svc_sit_exec, vendor_file_type, exec_type, file_type;
 init_daemon_domain(modem_svc_sit)
@@ -18,7 +17,7 @@ allow modem_svc_sit radio_vendor_data_file:file create_file_perms;
 allow modem_svc_sit modem_stat_data_file:dir create_dir_perms;
 allow modem_svc_sit modem_stat_data_file:file create_file_perms;
 
-allow modem_svc_sit mnt_vendor_file:dir r_dir_perms;
+allow modem_svc_sit mnt_vendor_file:dir search;
 allow modem_svc_sit modem_userdata_file:dir create_dir_perms;
 allow modem_svc_sit modem_userdata_file:file create_file_perms;
 
@@ -34,18 +33,3 @@ get_prop(modem_svc_sit, vendor_logger_prop)
 
 # Modem property
 set_prop(modem_svc_sit, vendor_modem_prop)
-
-# Write trace data to the Perfetto traced daemon. This requires connecting to
-# its producer socket and obtaining a (per-process) tmpfs fd.
-perfetto_producer(modem_svc_sit)
-
-# Allow modem_svc_sit to access modem image file/dir
-allow modem_svc_sit modem_img_file:dir r_dir_perms;
-allow modem_svc_sit modem_img_file:file r_file_perms;
-allow modem_svc_sit modem_img_file:lnk_file r_file_perms;
-
-# Allow modem_svc_sit to access socket for UMI
-userdebug_or_eng(`
-  allow modem_svc_sit radio_vendor_data_file:sock_file { create unlink };
-')
-

sepolicy/whitechapel/vendor/google/pixelstats_vendor.te

@@ -25,7 +25,6 @@ allow pixelstats_vendor fwk_sensor_service:service_manager find;
 
 # Batery history
 allow pixelstats_vendor battery_history_device:chr_file r_file_perms;
-allow pixelstats_vendor logbuffer_device:chr_file r_file_perms;
 
 #vendor-metrics
 r_dir_file(pixelstats_vendor, sysfs_vendor_metrics)

sepolicy/whitechapel/vendor/google/property.te

@@ -2,7 +2,6 @@
 vendor_internal_prop(vendor_prop)
 vendor_internal_prop(vendor_rcs_prop)
 vendor_internal_prop(vendor_rild_prop)
-vendor_internal_prop(vendor_gril_prop)
 vendor_internal_prop(sensors_prop)
 vendor_internal_prop(vendor_ssrdump_prop)
 vendor_internal_prop(vendor_usb_config_prop)
@@ -42,7 +41,7 @@ vendor_internal_prop(vendor_touchpanel_prop)
 vendor_internal_prop(vendor_tcpdump_log_prop)
 
 # Fingerprint
-vendor_restricted_prop(vendor_fingerprint_prop)
+vendor_internal_prop(vendor_fingerprint_prop)
 
 # Dynamic sensor
 vendor_internal_prop(vendor_dynamic_sensor_prop)

sepolicy/whitechapel/vendor/google/property_contexts

@@ -8,9 +8,6 @@ vendor.ril.                      u:object_r:vendor_rild_prop:s0
 vendor.radio.                    u:object_r:vendor_rild_prop:s0
 ro.vendor.build.svn              u:object_r:vendor_rild_prop:s0
 
-# for GRIL
-vendor.gril.                               u:object_r:vendor_gril_prop:s0
-
 # Ramdump
 persist.vendor.sys.crash_rcu    u:object_r:vendor_ramdump_prop:s0
 

sepolicy/whitechapel/vendor/google/ramdump_app.te

@@ -0,0 +1,24 @@
+type ramdump_app, domain;
+
+userdebug_or_eng(`
+  app_domain(ramdump_app)
+
+  allow ramdump_app app_api_service:service_manager find;
+
+  allow ramdump_app ramdump_vendor_data_file:file create_file_perms;
+  allow ramdump_app ramdump_vendor_data_file:dir create_dir_perms;
+
+  set_prop(ramdump_app, vendor_ramdump_prop)
+  get_prop(ramdump_app, system_boot_reason_prop)
+
+  # To access ramdumpfs.
+  allow ramdump_app mnt_vendor_file:dir search;
+  allow ramdump_app ramdump_vendor_mnt_file:dir create_dir_perms;
+  allow ramdump_app ramdump_vendor_mnt_file:file create_file_perms;
+
+  # To access subsystem ramdump files and dirs.
+  allow ramdump_app sscoredump_vendor_data_crashinfo_file:dir r_dir_perms;
+  allow ramdump_app sscoredump_vendor_data_crashinfo_file:file r_file_perms;
+  allow ramdump_app sscoredump_vendor_data_coredump_file:dir r_dir_perms;
+  allow ramdump_app sscoredump_vendor_data_coredump_file:file r_file_perms;
+')

sepolicy/whitechapel/vendor/google/rfsd.te

@@ -32,7 +32,6 @@ allow rfsd radio_device:chr_file rw_file_perms;
 # Allow to set rild and modem property
 set_prop(rfsd, vendor_modem_prop)
 set_prop(rfsd, vendor_rild_prop)
-set_prop(cbd, vendor_cbd_prop)
 
 # Allow rfsd to access modem image file/dir
 allow rfsd modem_img_file:dir r_dir_perms;

sepolicy/whitechapel/vendor/google/seapp_contexts

@@ -17,6 +17,10 @@ user=_app isPrivApp=true name=com.shannon.rcsservice domain=vendor_rcs_app level
 user=_app isPrivApp=true name=com.shannon.rcsservice:shannonrcsservice domain=vendor_rcs_app levelFrom=all
 user=_app isPrivApp=true name=com.shannon.qualifiednetworksservice domain=vendor_ims_app levelFrom=all
 
+# coredump/ramdump
+user=system seinfo=platform name=com.google.SSRestartDetector domain=ssr_detector_app type=system_app_data_file levelFrom=user
+user=_app seinfo=platform name=com.android.ramdump domain=ramdump_app type=app_data_file levelFrom=all
+
 # grilservice
 user=_app isPrivApp=true name=com.google.android.grilservice domain=grilservice_app levelFrom=all
 

sepolicy/whitechapel/vendor/google/ssr_detector.te

@@ -0,0 +1,24 @@
+type ssr_detector_app, domain;
+
+app_domain(ssr_detector_app)
+allow ssr_detector_app app_api_service:service_manager find;
+allow ssr_detector_app radio_service:service_manager find;
+
+allow ssr_detector_app system_app_data_file:dir create_dir_perms;
+allow ssr_detector_app system_app_data_file:file create_file_perms;
+
+allow ssr_detector_app sscoredump_vendor_data_crashinfo_file:dir r_dir_perms;
+allow ssr_detector_app sscoredump_vendor_data_crashinfo_file:file r_file_perms;
+userdebug_or_eng(`
+  allow ssr_detector_app sscoredump_vendor_data_coredump_file:dir r_dir_perms;
+  allow ssr_detector_app sscoredump_vendor_data_coredump_file:file r_file_perms;
+  allow ssr_detector_app sysfs_sjtag:dir r_dir_perms;
+  allow ssr_detector_app sysfs_sjtag:file rw_file_perms;
+  allow ssr_detector_app proc_vendor_sched:dir search;
+  allow ssr_detector_app proc_vendor_sched:file rw_file_perms;
+  allow ssr_detector_app cgroup:file write;
+')
+
+get_prop(ssr_detector_app, vendor_ssrdump_prop)
+get_prop(ssr_detector_app, vendor_wifi_version)
+get_prop(ssr_detector_app, vendor_aoc_prop)

sepolicy/whitechapel/vendor/google/vendor_init.te

@@ -14,8 +14,6 @@ get_prop(vendor_init, vendor_touchpanel_prop)
 set_prop(vendor_init, vendor_tcpdump_log_prop)
 set_prop(vendor_init, vendor_logger_prop)
 set_prop(vendor_init, esim_modem_prop)
-get_prop(vendor_init, telephony_modem_prop)
-
 
 allow vendor_init proc_dirty:file w_file_perms;
 allow vendor_init proc_sched:file write;

storage/5.10/init.gs101.storage.rc

@@ -1,3 +0,0 @@
-on init
-    write /sys/block/sda/queue/scheduler bfq
-    write /sys/block/sda/queue/iosched/slice_idle 0

storage/6.1/init.gs101.storage.rc

@@ -1,2 +0,0 @@
-on init
-    write /sys/block/sda/queue/scheduler mq-deadline

task_profiles.json

@@ -159,21 +159,6 @@
         }
       ]
     },
-    {
-      "Name": "HighPerformanceWI",
-      "Actions": [
-        {
-          "Name": "WriteFile",
-          "Params":
-          {
-            "FilePath": "/proc/vendor_sched/groups/fg_wi/set_task_group",
-            "ProcFilePath": "/proc/vendor_sched/groups/fg_wi/set_proc_group",
-            "Value": "<pid>",
-            "LogFailures": "false"
-          }
-        }
-      ]
-    },
     {
       "Name": "RealtimePerformance",
       "Actions": [
@@ -265,202 +250,6 @@
         }
       ]
     },
-    {
-      "Name": "AdpfSet",
-      "Actions": [
-        {
-          "Name": "WriteFile",
-          "Params":
-          {
-            "FilePath": "/proc/vendor_sched/sched_qos/adpf_set",
-            "Value": "<pid>",
-            "LogFailures": "false"
-          }
-        }
-      ]
-    },
-    {
-      "Name": "AdpfClear",
-      "Actions": [
-        {
-          "Name": "WriteFile",
-          "Params":
-          {
-            "FilePath": "/proc/vendor_sched/sched_qos/adpf_clear",
-            "Value": "<pid>",
-            "LogFailures": "false"
-          }
-        }
-      ]
-    },
-    {
-      "Name": "BoostPrioSet",
-      "Actions": [
-        {
-          "Name": "WriteFile",
-          "Params":
-          {
-            "FilePath": "/proc/vendor_sched/sched_qos/boost_prio_set",
-            "Value": "<pid>",
-            "LogFailures": "false"
-          }
-        }
-      ]
-    },
-    {
-      "Name": "BoostPrioClear",
-      "Actions": [
-        {
-          "Name": "WriteFile",
-          "Params":
-          {
-            "FilePath": "/proc/vendor_sched/sched_qos/boost_prio_clear",
-            "Value": "<pid>",
-            "LogFailures": "false"
-          }
-        }
-      ]
-    },
-    {
-      "Name": "PreemptWakeupSet",
-      "Actions": [
-        {
-          "Name": "WriteFile",
-          "Params":
-          {
-            "FilePath": "/proc/vendor_sched/sched_qos/preempt_wakeup_set",
-            "Value": "<pid>",
-            "LogFailures": "false"
-          }
-        }
-      ]
-    },
-    {
-      "Name": "PreemptWakeupClear",
-      "Actions": [
-        {
-          "Name": "WriteFile",
-          "Params":
-          {
-            "FilePath": "/proc/vendor_sched/sched_qos/preempt_wakeup_clear",
-            "Value": "<pid>",
-            "LogFailures": "false"
-          }
-        }
-      ]
-    },
-    {
-      "Name": "PreferFitSet",
-      "Actions": [
-        {
-          "Name": "WriteFile",
-          "Params":
-          {
-            "FilePath": "/proc/vendor_sched/sched_qos/prefer_fit_set",
-            "Value": "<pid>",
-            "LogFailures": "false"
-          }
-        }
-      ]
-    },
-    {
-      "Name": "PreferFitClear",
-      "Actions": [
-        {
-          "Name": "WriteFile",
-          "Params":
-          {
-            "FilePath": "/proc/vendor_sched/sched_qos/prefer_fit_clear",
-            "Value": "<pid>",
-            "LogFailures": "false"
-          }
-        }
-      ]
-    },
-    {
-      "Name": "PreferIdleSet",
-      "Actions": [
-        {
-          "Name": "WriteFile",
-          "Params":
-          {
-            "FilePath": "/proc/vendor_sched/sched_qos/prefer_idle_set",
-            "Value": "<pid>",
-            "LogFailures": "false"
-          }
-        }
-      ]
-    },
-    {
-      "Name": "PreferIdleClear",
-      "Actions": [
-        {
-          "Name": "WriteFile",
-          "Params":
-          {
-            "FilePath": "/proc/vendor_sched/sched_qos/prefer_idle_clear",
-            "Value": "<pid>",
-            "LogFailures": "false"
-          }
-        }
-      ]
-    },
-    {
-      "Name": "AutoUclampMaxSet",
-      "Actions": [
-        {
-          "Name": "WriteFile",
-          "Params":
-          {
-            "FilePath": "/proc/vendor_sched/sched_qos/auto_uclamp_max_set",
-            "Value": "<pid>",
-            "LogFailures": "false"
-          }
-        }
-      ]
-    },
-    {
-      "Name": "AutoUclampMaxClear",
-      "Actions": [
-        {
-          "Name": "WriteFile",
-          "Params":
-          {
-            "FilePath": "/proc/vendor_sched/sched_qos/auto_uclamp_max_clear",
-            "Value": "<pid>",
-            "LogFailures": "false"
-          }
-        }
-      ]
-    },
-    {
-      "Name": "PreferHighCapSet",
-      "Actions": [
-        {
-          "Name": "WriteFile",
-          "Params":
-          {
-            "FilePath": "/proc/vendor_sched/sched_qos/prefer_high_cap_set",
-            "Value": "<pid>",
-            "LogFailures": "false"
-          }
-        }
-      ]
-    },
-    {
-      "Name": "PreferHighCapClear",
-      "Actions": [
-        {
-          "Name": "WriteFile",
-          "Params":
-          {
-            "FilePath": "/proc/vendor_sched/sched_qos/prefer_high_cap_clear",
-            "Value": "<pid>",
-            "LogFailures": "false"
-          }
-        }
-      ]
-    },
     {
       "Name": "ResetUclampGrp",
       "Actions": [
@@ -498,35 +287,7 @@
     },
     {
       "Name": "OtaProfiles",
-      "Profiles": [ "OtaPerformance", "ServiceCapacityLow", "LowIoPriority", "TimerSlackHigh" ]
-    },
-    {
-      "Name": "SCHED_QOS_SENSITIVE_EXTREME_SET",
-      "Profiles": [ "AdpfSet", "PreferIdleSet", "PreferFitSet", "BoostPrioSet", "PreemptWakeupSet" ]
-    },
-    {
-      "Name": "SCHED_QOS_SENSITIVE_EXTREME_CLEAR",
-      "Profiles": [ "AdpfClear", "PreferIdleClear", "PreferFitClear", "BoostPrioClear", "PreemptWakeupClear" ]
-    },
-    {
-      "Name": "SCHED_QOS_SENSITIVE_STANDARD_SET",
-      "Profiles": [ "AdpfSet", "PreferIdleSet", "PreferFitSet" ]
-    },
-    {
-      "Name": "SCHED_QOS_SENSITIVE_STANDARD_CLEAR",
-      "Profiles": [ "AdpfClear", "PreferIdleClear", "PreferFitClear" ]
-    },
-    {
-      "Name": "SCHED_QOS_POWER_EFFICIENCY_SET",
-      "Profiles": [ "AutoUclampMaxSet" ]
-    },
-    {
-      "Name": "SCHED_QOS_POWER_EFFICIENCY_CLEAR",
-      "Profiles": [ "AutoUclampMaxClear" ]
-    },
-    {
-      "Name": "InputPolicy",
-      "Profiles": [ "MaxPerformance", "SCHED_QOS_SENSITIVE_EXTREME_SET" ]
+      "Profiles": [ "OtaPerformance", "ProcessCapacityNormal", "LowIoPriority", "TimerSlackHigh" ]
     }
   ]
 }

telephony/pktrouter.mk

@@ -1,5 +1,3 @@
 PRODUCT_PACKAGES += wfc-pkt-router
 PRODUCT_PROPERTY_OVERRIDES += vendor.pktrouter=1
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101/sepolicy/telephony/pktrouter
-PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
-    $(TARGET_COPY_OUT_SYSTEM)/bin/oem-iptables-init.sh

usb/gadget/UsbGadget.h

@@ -74,7 +74,7 @@ constexpr char kProcInterruptsPath[] = "/proc/interrupts";
 constexpr char kProcIrqPath[] = "/proc/irq/";
 constexpr char kSmpAffinityList[] = "/smp_affinity_list";
 #ifndef UDC_PATH
-#define UDC_PATH "/sys/devices/platform/11110000.usb/11110000.dwc3/udc/11110000.dwc3/"
+#define UDC_PATH "/sys/class/udc/11110000.dwc3/"
 #endif
 static MonitorFfs monitorFfs(kGadgetName);
 

usb/usb/Android.bp

@@ -52,7 +52,6 @@ cc_binary {
         "libbinder_ndk",
         "libprotobuf-cpp-lite",
         "server_configurable_flags",
-        "libaconfig_storage_read_api_cc",
     ],
     static_libs: [
         "libpixelusb",

usb/usb/Usb.cpp

@@ -593,11 +593,6 @@ ScopedAStatus Usb::switchRole(const string& in_portName, const PortRole& in_role
         fp = fopen(filename.c_str(), "w");
         if (fp != NULL) {
             int ret = fputs(convertRoletoString(in_role).c_str(), fp);
-            if (ret == EAGAIN) {
-                ALOGI("role switch busy, retry in %d ms", ROLE_SWAP_RETRY_MS);
-                std::this_thread::sleep_for(std::chrono::milliseconds(ROLE_SWAP_RETRY_MS));
-                ret = fputs(convertRoletoString(in_role).c_str(), fp);
-            }
             fclose(fp);
             if ((ret != EOF) && ReadFileToString(filename, &written)) {
                 written = Trim(written);
@@ -943,21 +938,17 @@ void queryVersionHelper(android::hardware::usb::Usb *usb,
     Status status;
     pthread_mutex_lock(&usb->mLock);
     status = getPortStatusHelper(usb, currentPortStatus);
-    if (status == Status::SUCCESS && currentPortStatus->size() > 0) {
-        queryMoistureDetectionStatus(usb, currentPortStatus);
-        queryPowerTransferStatus(usb, currentPortStatus);
-        queryNonCompliantChargerStatus(currentPortStatus);
-        queryUsbDataSession(usb, currentPortStatus);
-        if (usb->mCallback != NULL) {
-            ScopedAStatus ret = usb->mCallback->notifyPortStatusChange(*currentPortStatus,
-                status);
-            if (!ret.isOk())
-                ALOGE("queryPortStatus error %s", ret.getDescription().c_str());
-        } else {
-            ALOGI("Notifying userspace skipped. Callback is NULL");
-        }
+    queryMoistureDetectionStatus(usb, currentPortStatus);
+    queryPowerTransferStatus(usb, currentPortStatus);
+    queryNonCompliantChargerStatus(currentPortStatus);
+    queryUsbDataSession(usb, currentPortStatus);
+    if (usb->mCallback != NULL) {
+        ScopedAStatus ret = usb->mCallback->notifyPortStatusChange(*currentPortStatus,
+            status);
+        if (!ret.isOk())
+            ALOGE("queryPortStatus error %s", ret.getDescription().c_str());
     } else {
-        ALOGI("%s skipped. currentPortStatus is empty", __func__);
+        ALOGI("Notifying userspace skipped. Callback is NULL");
     }
     pthread_mutex_unlock(&usb->mLock);
 }

usb/usb/Usb.h

@@ -55,8 +55,6 @@ constexpr char kGadgetName[] = "11110000.dwc3";
 #define VBUS_PATH NEW_UDC_PATH "dwc3_exynos_otg_b_sess"
 #define USB_DATA_PATH NEW_UDC_PATH "usb_data_enabled"
 
-#define ROLE_SWAP_RETRY_MS 700
-
 struct Usb : public BnUsb {
     Usb();