gs101: Initialize for Evolution X 11.x

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

Android.bp

@@ -34,11 +34,3 @@ license {
         "NOTICE",
     ],
 }
-
-prebuilt_etc {
-    name: "preinstalled-packages-product-gs101-device-debug.xml",
-    src: "preinstalled-packages-product-gs101-device-debug.xml",
-    product_specific: true,
-    sub_dir: "sysconfig",
-    filename_from_src: true,
-}

Android.mk

@@ -1,37 +0,0 @@
-#
-# 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,21 +16,18 @@
 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,googleDeviceConfig,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)
 
@@ -46,7 +43,9 @@ 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
@@ -70,7 +69,7 @@ TARGET_RECOVERY_FSTAB_GENRULE = gen_fstab.gs101
 TARGET_RECOVERY_PIXEL_FORMAT := ABGR_8888
 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165
 TARGET_RECOVERY_UI_LIB := \
-	librecovery_ui_pixel \
+	//hardware/google/pixel/recovery:librecovery_ui_pixel \
 	libfstab
 
 AB_OTA_UPDATER := true
@@ -173,7 +172,16 @@ 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
@@ -187,8 +195,8 @@ BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := \
     vendor \
     vendor_dlkm
 
-# Set error limit to BOARD_SUPER_PARTITON_SIZE - 500MB
-BOARD_SUPER_PARTITION_ERROR_LIMIT := 8006926336
+# Set error limit to BOARD_SUPER_PARTITON_SIZE - 400MB
+BOARD_SUPER_PARTITION_ERROR_LIMIT := 8111783936
 
 # Testing related defines
 BOARD_PERFSETUP_SCRIPT := platform_testing/scripts/perf-setup/r4o6-setup.sh
@@ -200,12 +208,6 @@ BOARD_USES_GENERIC_AUDIO := true
 
 $(call soong_config_set,aoc_audio_func,ext_hidl,true)
 
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-$(call soong_config_set,aoc_audio_func,dump_usecase_data,true)
-$(call soong_config_set,aoc_audio_func,hal_socket_control,true)
-$(call soong_config_set,aoc_audio_func,record_tuning_keys,true)
-endif
-
 ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
 $(call soong_config_set,aoc_audio_func,aosp_build,true)
 endif
@@ -242,6 +244,8 @@ 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
@@ -359,12 +363,16 @@ 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/fips140.ko
+BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES = 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
-BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_boot.modules.load))
+# Starting from 6.1, use modules.load instead. It lists modules for vendor ramdisk regardless of the partition name.
+ifneq ($(wildcard $(KERNEL_MODULE_DIR)/modules.load),)
+    BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/modules.load))
+else
+    BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_boot.modules.load))
+endif
 ifndef BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE
 $(error vendor_boot.modules.load not found or empty)
 endif
@@ -393,7 +401,5 @@ BOARD_KERNEL_CMDLINE += log_buf_len=1024K
 # Protected VM firmware
 BOARD_PVMFWIMAGE_PARTITION_SIZE := 0x00100000
 
--include vendor/google_devices/gs-common/proprietary/BoardConfigVendor.mk
-
 include device/google/gs101/BoardConfigLineage.mk
 include device/google/gs101/BoardConfigEvolution.mk

BoardConfigEvolution.mk

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

BoardConfigLineage.mk

@@ -1,15 +1,10 @@
 #
-# Copyright (C) 2021 The Calyx Institute
-#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 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
 
 # Partitions

CleanSpec.mk

@@ -1,91 +0,0 @@
-# Copyright (C) 2012 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.
-#
-
-# If you don't need to do a full clean build but would like to touch
-# a file or delete some intermediate files, add a clean step to the end
-# of the list.  These steps will only be run once, if they haven't been
-# run before.
-#
-# E.g.:
-#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
-#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
-#
-# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
-# files that are missing or have been moved.
-#
-# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
-# Use $(OUT_DIR) to refer to the "out" directory.
-#
-# If you need to re-do something that's already mentioned, just copy
-# the command and add it to the bottom of the list.  E.g., if a change
-# that you made last week required touching a file and a change you
-# made today requires touching the same file, just copy the old
-# touch step and add it to the end of the list.
-#
-# ************************************************
-# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
-# ************************************************
-
-# For example:
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
-#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
-#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
-$(call add-clean-step, find $(PRODUCT_OUT) -name "*.apk" | xargs rm)
-
-# ************************************************
-# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
-# ************************************************
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libsurfaceflinger_intermediates)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libui_intermediates)
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/root/default.prop)
-$(call add-clean-step, rm -f $(TARGET_OUT)/build.prop)
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/etc/mixer_paths_lb.xml)
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/etc/permissions/android.hardware.camera.xml)
-
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/root/*)
-# Power HAL 1.0
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/init/android.hardware.power@1.0-service.rc)
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.power@1.0-service)
-# Power HAL HIDL
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/etc/init/android.hardware.power@1.3-service.pixel-libperfmgr.rc)
-
-# Health storage HAL
-$(call add-clean-step, find $(PRODUCT_OUT) -type f -name "*android.hardware.health.storage@1.0*" -print0 | xargs -0 rm -f)
-
-# USB HAL to AIDL
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.usb-service.gs101)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.usb.gadget-service.gs101)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.usb-service.rc)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.usb.gadget-service-gs101.rc)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.usb-service.xml)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.usb.gadget@1.2-service.gs101.xml)
-
-# Power Stats HAL 1.0 to AIDL
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.power.stats@1.0-service.gs101)
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/etc/init/android.hardware.power.stats@1.0-service.gs101.rc)
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.power.stats@1.0-service.gs101.xml)
-
-# Keymaster to KeyMint
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.keymaster@4.0-service.trusty)
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/etc/init/android.hardware.keymaster@4.0-service.trusty.rc)
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.keymaster@4.0-service.trusty.xml)
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/bin/hw/wait_for_strongbox)
-
-# Health HAL to AIDL
-$(call add-clean-step, find $(PRODUCT_OUT)/system -type f -name "*charger*" -print0 | xargs -0 rm -f)
-$(call add-clean-step, find $(PRODUCT_OUT)/vendor -type f -name "*health@*" -print0 | xargs -0 rm -f)
-$(call add-clean-step, find $(PRODUCT_OUT)/recovery/root -type f -name "*charger*" -print0 | xargs -0 rm -f)
-$(call add-clean-step, find $(PRODUCT_OUT)/recovery/root -type f -name "*health@*" -print0 | xargs -0 rm -f)

OWNERS

@@ -1,5 +0,0 @@
-per-file powerhint.json = wvw@google.com,joaodias@google.com,jenhaochen@google.com,rkganesh@google.com,jychen@google.com
-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=file:device/google/gs-common:main:/OWNERS

PREUPLOAD.cfg

@@ -1,2 +0,0 @@
-[Builtin Hooks]
-jsonlint = true

aosp_common.mk

@@ -49,7 +49,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk)
 
 #$(call inherit-product, device/google/gs101/device.mk)
-#$(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk)
 
 # TODO: fix
 # PRODUCT_RESTRICT_VENDOR_FILES := all

conf/init.debug.rc

@@ -1,30 +0,0 @@
-# SJTAG
-on init
-    chown system system /sys/devices/platform/sjtag_ap/interface/access_lvl
-    chown system system /sys/devices/platform/sjtag_ap/interface/auth
-    chown system system /sys/devices/platform/sjtag_ap/interface/begin
-    chown system system /sys/devices/platform/sjtag_ap/interface/dbg_domain
-    chown system system /sys/devices/platform/sjtag_ap/interface/dbg_itvl
-    chown system system /sys/devices/platform/sjtag_ap/interface/end
-    chown system system /sys/devices/platform/sjtag_ap/interface/pubkey
-    chown system system /sys/devices/platform/sjtag_gsa/interface/access_lvl
-    chown system system /sys/devices/platform/sjtag_gsa/interface/auth
-    chown system system /sys/devices/platform/sjtag_gsa/interface/begin
-    chown system system /sys/devices/platform/sjtag_gsa/interface/dbg_domain
-    chown system system /sys/devices/platform/sjtag_gsa/interface/dbg_itvl
-    chown system system /sys/devices/platform/sjtag_gsa/interface/end
-    chown system system /sys/devices/platform/sjtag_gsa/interface/pubkey
-
-# Bluetooth
-on post-fs-data
-    chown bluetooth system /dev/logbuffer_btlpm
-    chown bluetooth system /dev/logbuffer_tty16
-
-on property:vendor.debug.ramdump.force_crash=true
-    write /sys/kernel/pixel_debug/trigger "null"
-
-on property:power.battery_input.suspended=true
-   write /sys/kernel/debug/google_charger/input_suspend 1
-
-on property:power.battery_input.suspended=false
-   write /sys/kernel/debug/google_charger/input_suspend 0

conf/init.gs101.rc

@@ -1,3 +1,4 @@
+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
@@ -15,38 +16,6 @@ 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
-    chown system system /proc/vendor_sched/groups/nnapi/set_task_group
-    chown system system /proc/vendor_sched/groups/sys/set_task_group
-    chown system system /proc/vendor_sched/groups/sys_bg/set_task_group
-    chown system system /proc/vendor_sched/groups/ta/set_task_group
-    chown system system /proc/vendor_sched/groups/rt/set_task_group
-    chown system system /proc/vendor_sched/groups/sf/set_task_group
-    chown system system /proc/vendor_sched/groups/dex2oat/set_task_group
-    chown system system /proc/vendor_sched/groups/cam_power/set_task_group
-    chown system system /proc/vendor_sched/groups/ota/set_task_group
-    chown system system /proc/vendor_sched/groups/bg/set_proc_group
-    chown system system /proc/vendor_sched/groups/cam/set_proc_group
-    chown system system /proc/vendor_sched/groups/fg/set_proc_group
-    chown system system /proc/vendor_sched/groups/nnapi/set_proc_group
-    chown system system /proc/vendor_sched/groups/sys/set_proc_group
-    chown system system /proc/vendor_sched/groups/sys_bg/set_proc_group
-    chown system system /proc/vendor_sched/groups/ta/set_proc_group
-    chown system system /proc/vendor_sched/groups/rt/set_proc_group
-    chown system system /proc/vendor_sched/groups/sf/set_proc_group
-    chown system system /proc/vendor_sched/groups/dex2oat/set_proc_group
-    chown system system /proc/vendor_sched/groups/cam_power/set_proc_group
-    chown system system /proc/vendor_sched/groups/ota/set_proc_group
-    chown system system /proc/vendor_sched/prefer_idle_set
-    chown system system /proc/vendor_sched/prefer_idle_clear
-    chown system system /proc/vendor_sched/pmu_poll_enable
-    chown system system /proc/vendor_sched/pmu_poll_time
     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
@@ -68,35 +37,6 @@ on init
     chown system system /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu6_memlat@17000010/memlat_cpuidle_state_aware
     chown system system /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu7_memlat@17000010/memlat_cpuidle_state_aware
 
-    chmod 0220 /proc/vendor_sched/groups/bg/set_task_group
-    chmod 0220 /proc/vendor_sched/groups/cam/set_task_group
-    chmod 0220 /proc/vendor_sched/groups/fg/set_task_group
-    chmod 0220 /proc/vendor_sched/groups/nnapi/set_task_group
-    chmod 0220 /proc/vendor_sched/groups/sys/set_task_group
-    chmod 0220 /proc/vendor_sched/groups/sys_bg/set_task_group
-    chmod 0220 /proc/vendor_sched/groups/ta/set_task_group
-    chmod 0220 /proc/vendor_sched/groups/rt/set_task_group
-    chmod 0220 /proc/vendor_sched/groups/sf/set_task_group
-    chmod 0220 /proc/vendor_sched/groups/dex2oat/set_task_group
-    chmod 0220 /proc/vendor_sched/groups/cam_power/set_task_group
-    chmod 0220 /proc/vendor_sched/groups/ota/set_task_group
-    chmod 0220 /proc/vendor_sched/groups/bg/set_proc_group
-    chmod 0220 /proc/vendor_sched/groups/cam/set_proc_group
-    chmod 0220 /proc/vendor_sched/groups/fg/set_proc_group
-    chmod 0220 /proc/vendor_sched/groups/nnapi/set_proc_group
-    chmod 0220 /proc/vendor_sched/groups/sys/set_proc_group
-    chmod 0220 /proc/vendor_sched/groups/sys_bg/set_proc_group
-    chmod 0220 /proc/vendor_sched/groups/ta/set_proc_group
-    chmod 0220 /proc/vendor_sched/groups/rt/set_proc_group
-    chmod 0220 /proc/vendor_sched/groups/sf/set_proc_group
-    chmod 0220 /proc/vendor_sched/groups/dex2oat/set_proc_group
-    chmod 0220 /proc/vendor_sched/groups/cam_power/set_proc_group
-    chmod 0220 /proc/vendor_sched/groups/ota/set_proc_group
-    chmod 0220 /proc/vendor_sched/prefer_idle_set
-    chmod 0220 /proc/vendor_sched/prefer_idle_clear
-    chmod 0220 /proc/vendor_sched/pmu_poll_enable
-    chmod 0220 /proc/vendor_sched/pmu_poll_time
-
     start vendor.keymaster-3-0
 
     # ZRAM setup
@@ -137,16 +77,6 @@ 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
@@ -158,14 +88,11 @@ 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
@@ -177,15 +104,6 @@ on init
     write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu6_memlat@17000010/memlat_cpuidle_state_aware 2
     write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu7_memlat@17000010/memlat_cpuidle_state_aware 2
 
-    # RT uclamp setting
-    write /proc/sys/kernel/sched_util_clamp_min_rt_default 0
-
-    # change permissions and default values for camera-daemon cpu controller
-    chown system system /dev/cpuctl/camera-daemon/cpu.uclamp.min
-    chown system system /dev/cpuctl/camera-daemon/cpu.uclamp.max
-    chown root root /dev/cpuctl/camera-daemon/cpu.uclamp.latency_sensitive
-    chown system system /dev/cpuctl/camera-daemon/cgroup.procs
-
     mkdir /dev/cpuset/camera-daemon-high-group
     write /dev/cpuset/camera-daemon-high-group/cpus 0-7
     write /dev/cpuset/camera-daemon-high-group/mems 0
@@ -204,11 +122,6 @@ on init
     chown system system /dev/cpuset/camera-daemon-mid-high-group/tasks
     chmod 0664 /dev/cpuset/camera-daemon-mid-high-group/tasks
 
-    write /proc/vendor_sched/groups/cam/prefer_idle 1
-    write /proc/vendor_sched/groups/cam/uclamp_min 1
-
-    chown system system /dev/cpuset/cgroup.procs
-
     # nanohub sensor
     chmod 0664 /dev/nanohub
     chmod 0664 /dev/nanohub_comms
@@ -277,6 +190,7 @@ 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
@@ -323,10 +237,6 @@ on init
     # Power Stats HAL
     chown system system /dev/bbd_pwrstat
 
-    # Add a boost for NNAPI HAL
-    write /proc/vendor_sched/groups/nnapi/prefer_idle 0
-    write /proc/vendor_sched/groups/nnapi/uclamp_min 512
-
     # Add memlat governor settings
     write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu0_memlat@17000010/polling_interval 10
     write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu1_memlat@17000010/polling_interval 10
@@ -370,6 +280,11 @@ 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
@@ -388,7 +303,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 0770 radio system
+    mkdir /data/vendor/radio/extended_logs 0771 radio system
 
     # Modem MDS log folder
     mkdir /data/vendor/radio/mds 0771 radio system
@@ -425,8 +340,8 @@ on post-fs-data
     restorecon /sys/kernel/debug/tracing/trace_marker
 
     # ranging sensor
-    chown system system /dev/stmvl53l1_ranging
-    chmod 0660 /dev/stmvl53l1_ranging
+    chown system system /dev/ispolin_ranging
+    chmod 0660 /dev/ispolin_ranging
 
     # Factory calibration files
     chmod 0771 /mnt/vendor/persist/camera
@@ -696,27 +611,13 @@ on property:sys.boot_completed=1
     # Setup final cpuset
     write /dev/cpuset/top-app/cpus ${persist.device_config.vendor_system_native.top-app_cpuset:-0-7}
     write /dev/cpuset/foreground/cpus ${persist.device_config.vendor_system_native.foreground_cpuset:-0-3,4-5}
+    write /dev/cpuset/foreground_window/cpus ${persist.device_config.vendor_system_native.foreground_window_cpuset:-0-3,4-5}
     write /dev/cpuset/background/cpus ${persist.device_config.vendor_system_native.background_cpuset:-0-3}
     write /dev/cpuset/system-background/cpus ${persist.device_config.vendor_system_native.system-background_cpuset:-0-3}
     write /dev/cpuset/restricted/cpus ${persist.device_config.vendor_system_native.restricted_cpuset:-0-3}
     write /dev/cpuset/camera-daemon/cpus ${persist.device_config.vendor_system_native.camera-daemon_cpuset:-0-7}
     setprop vendor.powerhal.init 1
 
-    # Setup final cpu.uclamp
-    write /proc/vendor_sched/groups/ta/uclamp_min 1
-    write /proc/vendor_sched/groups/fg/uclamp_min 0
-    write /proc/vendor_sched/groups/sys/prefer_idle 0
-
-    # Set ug group
-    write /proc/vendor_sched/groups/bg/ug 0
-    write /proc/vendor_sched/groups/sys_bg/ug 0
-    write /proc/vendor_sched/groups/ota/ug 0
-    write /proc/vendor_sched/groups/dex2oat/ug 1
-    write /proc/vendor_sched/groups/ta/ug 1
-
-    # Set bg group throttle
-    write /proc/vendor_sched/ug_bg_group_throttle ${persist.device_config.vendor_system_native.ug_bg_group_throttle:-308}
-
     # Set uclamp.max for some groups, which could indicate cpu importance used in scheduling
     write /proc/vendor_sched/groups/bg/uclamp_max 512
     write /proc/vendor_sched/groups/sys_bg/uclamp_max 512
@@ -735,24 +636,6 @@ on property:sys.boot_completed=1
     write /sys/devices/system/cpu/cpufreq/policy6/sched_pixel/limit_frequency 2507000
     write /proc/vendor_sched/pmu_poll_time 10
 
-    # Disable PMU freq limit
-    write /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/pmu_limit_enable 1
-    write /sys/devices/system/cpu/cpufreq/policy4/sched_pixel/pmu_limit_enable 1
-    write /sys/devices/system/cpu/cpufreq/policy6/sched_pixel/pmu_limit_enable 1
-    write /proc/vendor_sched/pmu_poll_enable 0
-
-    # Setup cpu.shares to throttle background groups (bg ~ 5% sysbg ~ 5% dex2oat ~2.5%)
-    write /dev/cpuctl/background/cpu.shares 1024
-    write /dev/cpuctl/system-background/cpu.shares 1024
-    write /dev/cpuctl/dex2oat/cpu.shares 512
-    write /dev/cpuctl/system/cpu.shares 20480
-    # We only have system and background groups holding tasks and the groups below are empty
-    write /dev/cpuctl/camera-daemon/cpu.shares 20480
-    write /dev/cpuctl/foreground/cpu.shares 20480
-    write /dev/cpuctl/nnapi-hal/cpu.shares 20480
-    write /dev/cpuctl/rt/cpu.shares 20480
-    write /dev/cpuctl/top-app/cpu.shares 20480
-
     # gvotables for dumpstate
     chown system system /sys/kernel/debug/gvotables
 
@@ -796,6 +679,7 @@ service init_display /vendor/bin/init.display.sh
     group root system
     disabled
     oneshot
+    file /dev/kmsg w
 
 # bugreport is triggered by holding down volume down, volume up and power
 service bugreport /system/bin/dumpstate -d -p -z
@@ -829,10 +713,12 @@ on property:ro.build.fingerprint=*
     write /sys/module/debug_kinfo/parameters/build_info ${ro.build.fingerprint}
 
 # Bluetooth
-on post-fs-data
+on early-boot
     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
@@ -852,50 +738,12 @@ 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
@@ -967,6 +815,8 @@ on property:persist.device_config.vendor_system_native.top-app_cpuset=*
     write /dev/cpuset/top-app/cpus ${persist.device_config.vendor_system_native.top-app_cpuset:-0-7}
 on property:persist.device_config.vendor_system_native.foreground_cpuset=*
     write /dev/cpuset/foreground/cpus ${persist.device_config.vendor_system_native.foreground_cpuset:-0-3,4-5}
+on property:persist.device_config.vendor_system_native.foreground_window_cpuset=*
+    write /dev/cpuset/foreground/cpus ${persist.device_config.vendor_system_native.foreground_window_cpuset:-0-3,4-5}
 on property:persist.device_config.vendor_system_native.background_cpuset=*
     write /dev/cpuset/background/cpus ${persist.device_config.vendor_system_native.background_cpuset:-0-3}
 on property:persist.device_config.vendor_system_native.system-background_cpuset=*
@@ -979,3 +829,14 @@ on property:persist.device_config.vendor_system_native.camera-daemon_cpuset=*
 # Set esim property for LPA
 on property:persist.vendor.modem.esim_profiles_exist=*
     setprop persist.modem.esim_profiles_exist ${persist.vendor.modem.esim_profiles_exist}
+
+# Battery health
+on property:persist.vendor.pulsar.opt_out=1
+    write /sys/class/power_supply/battery/aacp_opt_out 1
+
+on property:persist.vendor.pulsar.opt_out=0
+    write /sys/class/power_supply/battery/aacp_opt_out 0
+
+# NFC
+on post-fs-data
+    mkdir /data/vendor/nfc 0770 nfc nfc

conf/init.gs101.usb.rc

@@ -75,7 +75,7 @@ on early-boot
     mkdir /config/usb_gadget/g1/functions/uvc.0
     write /config/usb_gadget/g1/functions/uvc.0/function_name "Android Webcam"
     write /config/usb_gadget/g1/functions/uvc.0/streaming_maxpacket 3072
-    # write /config/usb_gadget/g1/functions/uvc.0/streaming_maxburst 5
+    write /config/usb_gadget/g1/functions/uvc.0/streaming_maxburst 1
     # write /config/usb_gadget/g1/functions/uvc.0/streaming_interval 2
     # setup control params
     mkdir /config/usb_gadget/g1/functions/uvc.0/control/header/h
@@ -414,3 +414,7 @@ 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,7 +55,6 @@
         <!-- 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"/>
@@ -73,6 +72,8 @@
         <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
@@ -170,4 +171,11 @@
         <!-- 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-common.mk

@@ -14,9 +14,6 @@
 # limitations under the License.
 #
 
-ifneq ($(BOARD_WITHOUT_RADIO),true)
--include vendor/google_devices/gs101/proprietary/telephony/device-vendor.mk
-endif
 include device/google/gs101/device.mk
 
 ifneq ($(BOARD_WITHOUT_RADIO),true)

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/ramdump.mk
+include device/google/gs-common/ramdump_and_coredump/ramdump_and_coredump.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,8 @@ include device/google/gs-common/thermal/dump/thermal.mk
 include device/google/gs-common/thermal/thermal_hal/device.mk
 include device/google/gs-common/pixel_metrics/pixel_metrics.mk
 include device/google/gs-common/performance/perf.mk
-include device/google/gs-common/display/dump.mk
+include device/google/gs-common/power/power.mk
+include device/google/gs-common/display/dump_exynos_display.mk
 include device/google/gs101/dumpstate/item.mk
 include device/google/gs-common/radio/dump.mk
 include device/google/gs-common/gear/dumpstate/aidl.mk
@@ -34,11 +35,11 @@ include device/google/gs-common/gps/dump/log.mk
 include device/google/gs-common/widevine/widevine.mk
 include device/google/gs-common/sota_app/factoryota.mk
 include device/google/gs-common/misc_writer/misc_writer.mk
-include device/google/gs-common/gyotaku_app/gyotaku.mk
 include device/google/gs-common/bootctrl/bootctrl_aidl.mk
-ifneq ($(filter oriole raven bluejay, $(TARGET_PRODUCT)),)
-  include device/google/gs-common/bcmbt/dump/dumplog.mk
-endif
+include device/google/gs-common/betterbug/betterbug.mk
+include device/google/gs-common/bcmbt/dump/dumplog.mk
+include device/google/gs-common/fingerprint/fingerprint.mk
+include device/google/gs-common/nfc/nfc.mk
 
 TARGET_BOARD_PLATFORM := gs101
 DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false)
@@ -54,72 +55,24 @@ AB_OTA_POSTINSTALL_CONFIG += \
 POSTINSTALL_OPTIONAL_system=true
 
 # Set Vendor SPL to match platform
-VENDOR_SECURITY_PATCH = $(PLATFORM_SECURITY_PATCH)
+VENDOR_SECURITY_PATCH := 2025-08-05
 
 # Set boot SPL
-BOOT_SECURITY_PATCH = $(PLATFORM_SECURITY_PATCH)
+BOOT_SECURITY_PATCH := 2025-08-05
 
 PRODUCT_SOONG_NAMESPACES += \
 	hardware/google/av \
-	hardware/google/gchips \
-	hardware/google/graphics/common \
-	hardware/google/gchips/gralloc4 \
-	hardware/google/graphics/gs101 \
 	hardware/google/interfaces \
 	hardware/google/pixel \
 	device/google/gs101 \
-	device/google/gs101/powerstats \
-	vendor/google_devices/common/chre/host/hal \
-	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
-
-LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
+	device/google/gs101/powerstats
 
 # OEM Unlock reporting
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 	ro.oem_unlock_supported=1
 
-ifneq ($(BOARD_WITHOUT_RADIO),true)
-# Include vendor telephony soong namespace
-PRODUCT_SOONG_NAMESPACES += \
-	vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)
-endif
-
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-#Set IKE logs to verbose for WFC
-PRODUCT_PROPERTY_OVERRIDES += log.tag.IKE=VERBOSE
-
-#Set Shannon IMS logs to debug
-PRODUCT_PROPERTY_OVERRIDES += log.tag.SHANNON_IMS=DEBUG
-
-#Set Shannon QNS logs to debug
-PRODUCT_PROPERTY_OVERRIDES += log.tag.ShannonQNS=DEBUG
-PRODUCT_PROPERTY_OVERRIDES += log.tag.ShannonQNS-ims=DEBUG
-PRODUCT_PROPERTY_OVERRIDES += log.tag.ShannonQNS-emergency=DEBUG
-PRODUCT_PROPERTY_OVERRIDES += log.tag.ShannonQNS-mms=DEBUG
-PRODUCT_PROPERTY_OVERRIDES += log.tag.ShannonQNS-xcap=DEBUG
-PRODUCT_PROPERTY_OVERRIDES += log.tag.ShannonQNS-HC=DEBUG
-
-# Modem userdebug
-include device/google/gs101/modem/userdebug.mk
-endif
-
 include device/google/gs101/modem/user.mk
 
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-# b/36703476: Set default log size to 1M
-PRODUCT_PROPERTY_OVERRIDES += \
-	ro.logd.size=1M
-# b/114766334: persist all logs by default rotating on 30 files of 1MiB
-PRODUCT_PROPERTY_OVERRIDES += \
-	logd.logpersistd=logcatd \
-	logd.logpersistd.size=30
-endif
-
 # From system.property
 PRODUCT_PROPERTY_OVERRIDES += \
 	ro.telephony.default_network=27 \
@@ -179,9 +132,15 @@ 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)
+    $(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
@@ -200,18 +159,25 @@ USE_SWIFTSHADER := false
 # HWUI
 TARGET_USES_VULKAN = true
 
-PRODUCT_SOONG_NAMESPACES += \
-	vendor/arm/mali/valhall
-
-$(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM))
+# Used in gfx_tools when defining tests with composer2 interface for gs101 devices
+$(call soong_config_set,gfx_tools,use_hwc2,true)
 
 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
 
@@ -222,7 +188,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=3 \
+	vendor.mali.base_protected_max_core_count=4 \
 	vendor.mali.base_protected_tls_max=67108864 \
 	vendor.mali.platform_agt_frequency_khz=24576
 
@@ -238,9 +204,8 @@ 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.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
+	frameworks/native/data/etc/android.software.vulkan.deqp.level-2025-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \
+	frameworks/native/data/etc/android.software.opengles.deqp.level-2025-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml
 
 ifeq ($(USE_SWIFTSHADER),true)
 PRODUCT_VENDOR_PROPERTIES += \
@@ -269,6 +234,7 @@ 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
@@ -295,16 +261,18 @@ PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true
 
 # Init files
 PRODUCT_COPY_FILES += \
-	$(LOCAL_KERNEL):kernel \
 	device/google/gs101/conf/init.gs101.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs101.usb.rc \
 	device/google/gs101/conf/ueventd.gs101.rc:$(TARGET_COPY_OUT_VENDOR)/etc/ueventd.rc
 
 PRODUCT_COPY_FILES += \
 	device/google/gs101/conf/init.gs101.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs101.rc
 
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter 5.%, $(TARGET_LINUX_KERNEL_VERSION)))
 PRODUCT_COPY_FILES += \
-	device/google/gs101/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc
+	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
@@ -333,6 +301,10 @@ 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
@@ -341,14 +313,6 @@ PRODUCT_PACKAGES += \
 	messaging
 
 # CHRE
-## tools
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES += \
-	chre_power_test_client \
-	chre_test_client \
-	chre_aidl_hal_client
-endif
-
 ## HAL
 include device/google/gs-common/chre/hal.mk
 PRODUCT_COPY_FILES += \
@@ -367,13 +331,8 @@ PRODUCT_PACKAGES += \
 	checkpoint_gc
 
 # Vendor verbose logging default property
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PROPERTY_OVERRIDES += \
-	persist.vendor.verbose_logging_enabled=true
-else
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.verbose_logging_enabled=false
-endif
 
 # CP Logging properties
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -385,13 +344,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.sys.modem.logging.enable=true
 
 # Enable silent CP crash handling
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PROPERTY_OVERRIDES += \
-	persist.vendor.ril.crash_handling_mode=1
-else
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.ril.crash_handling_mode=2
-endif
 
 # Add support dual SIM mode
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -445,12 +399,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml
 
-# default usb debug functions
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PROPERTY_OVERRIDES += \
-	persist.vendor.usb.usbradio.config=dm
-endif
-
 # Power HAL
 PRODUCT_COPY_FILES += \
 	device/google/gs101/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json
@@ -508,10 +456,6 @@ 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 \
@@ -543,14 +487,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
         ConnectivityOverlay
 
-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
 
@@ -558,6 +494,9 @@ 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
 
@@ -636,10 +575,6 @@ PRODUCT_PACKAGES += \
 	libdisplaycolor \
 	hwcomposer.$(TARGET_BOARD_PLATFORM)
 
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES += displaycolor_service
-endif
-
 PRODUCT_PROPERTY_OVERRIDES += \
 	debug.sf.disable_backpressure=0 \
 	debug.sf.enable_gl_backpressure=1
@@ -713,11 +648,6 @@ PRODUCT_PACKAGES += wpa_supplicant.conf
 
 WIFI_PRIV_CMD_UPDATE_MBO_CELL_STATUS := enabled
 
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES += wpa_cli
-PRODUCT_PACKAGES += hostapd_cli
-endif
-
 ####################################
 ## VIDEO
 ####################################
@@ -734,16 +664,25 @@ 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 \
@@ -777,15 +716,9 @@ ifeq (,$(filter tangor citron,$(subst _, ,$(TARGET_PRODUCT))))
 include device/google/gs-common/gps/brcm/device.mk
 PRODUCT_COPY_FILES += \
 	device/google/gs101/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-        PRODUCT_COPY_FILES += \
-                device/google/gs101/location/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-                device/google/gs101/location/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
-else
-        PRODUCT_COPY_FILES += \
-                device/google/gs101/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-                device/google/gs101/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
-endif
+PRODUCT_COPY_FILES += \
+    device/google/gs101/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+    device/google/gs101/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
 endif
 # Trusty (KM, GK, Storage)
 $(call inherit-product, system/core/trusty/trusty-storage.mk)
@@ -794,13 +727,6 @@ $(call inherit-product, system/core/trusty/trusty-base.mk)
 # Trusty dump
 include device/google/gs-common/trusty/trusty.mk
 
-# Trusty unit test tool
-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
 
 PRODUCT_PACKAGES += \
@@ -812,15 +738,13 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	ro.frp.pst=/dev/block/by-name/frp
 
 # System props to enable Bluetooth Quality Report (BQR) feature
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PRODUCT_PROPERTIES += \
-	persist.bluetooth.bqr.event_mask=262174 \
-	persist.bluetooth.bqr.min_interval_ms=500
-else
 PRODUCT_PRODUCT_PROPERTIES += \
 	persist.bluetooth.bqr.event_mask=30 \
 	persist.bluetooth.bqr.min_interval_ms=500
-endif
+
+# Enable Bluetooth AutoOn feature
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.server.automatic_turn_on=true
 
 #VNDK
 PRODUCT_PACKAGES += \
@@ -852,12 +776,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
 	Iwlan
 
-#Iwlan test app for userdebug/eng builds
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES += \
-	IwlanTestApp
-endif
-
 PRODUCT_PACKAGES += \
 	whitelist \
 	libstagefright_hdcp \
@@ -871,24 +789,15 @@ PRODUCT_PACKAGES += \
 	vts.bin
 
 ifneq ($(BOARD_WITHOUT_RADIO),true)
-# This will be called only if IMSService is building with source code for dev branches.
-$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/shannon-ims/device-vendor.mk)
-
 PRODUCT_PACKAGES += ShannonIms
 
-$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/shannon-iwlan/device-vendor.mk)
-
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES_DEBUG += \
-	preinstalled-packages-product-gs101-device-debug.xml
-endif
-
 PRODUCT_PACKAGES += ShannonRcs
 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
@@ -897,22 +806,12 @@ USE_RADIO_HAL_1_6 := true
 # Support SecureElement HAL for HIDL
 USE_SE_HIDL := true
 
-#$(call inherit-product, vendor/google_devices/telephony/common/device-vendor.mk)
-#$(call inherit-product, vendor/google_devices/gs101/proprietary/device-vendor.mk)
-
-ifneq ($(BOARD_WITHOUT_RADIO),true)
-$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk)
-endif
-
 ifeq ($(DEVICE_IS_64BIT_ONLY),true)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
 else
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 endif
-#$(call inherit-product, hardware/google_devices/exynos5/exynos5.mk)
-#$(call inherit-product-if-exists, hardware/google_devices/gs101/gs101.mk)
-#$(call inherit-product-if-exists, vendor/google_devices/common/exynos-vendor.mk)
-#$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4375/device-bcm.mk)
+
 include device/google/gs-common/sensors/sensors.mk
 $(call soong_config_set,usf,target_soc,gs101)
 
@@ -920,9 +819,6 @@ 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
 
@@ -950,15 +846,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
 	device/google/gs101/radio/gnss_blanking.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/gnss_blanking.csv
 
-# Vibrator Diag
-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 \
 	android.hardware.health-service.gs101_recovery \
@@ -968,9 +855,6 @@ PRODUCT_PACKAGES += \
 include device/google/gs-common/audio/hidl_gs101.mk
 
 ## AoC soong
-PRODUCT_SOONG_NAMESPACES += \
-        vendor/google/whitechapel/aoc
-
 $(call soong_config_set,aoc,target_soc,$(TARGET_BOARD_PLATFORM))
 $(call soong_config_set,aoc,target_product,$(TARGET_PRODUCT))
 
@@ -992,22 +876,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PACKAGES += vndservicemanager
 PRODUCT_PACKAGES += vndservice
 
-# TinyTools, debug tool and cs35l41 speaker calibration tool for Audio
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES += \
-	tinyplay \
-	tinycap \
-	tinymix \
-	tinypcminfo \
-	tinyhostless \
-	cplay \
-	aoc_hal \
-	aoc_tuning_inft \
-	crus_sp_cal \
-	mahal_test \
-	ma_aoc_tuning_test
-endif
-
 PRODUCT_PACKAGES += \
 	google.hardware.media.c2@1.0-service \
 	libgc2_store \
@@ -1017,6 +885,9 @@ PRODUCT_PACKAGES += \
 	libgc2_cwl \
 	libgc2_utils
 
+## Start packet router
+include device/google/gs-common/telephony/pktrouter.mk
+
 # Thermal HAL
 PRODUCT_PROPERTY_OVERRIDES += persist.vendor.enable.thermal.genl=true
 
@@ -1024,14 +895,7 @@ PRODUCT_PROPERTY_OVERRIDES += persist.vendor.enable.thermal.genl=true
 include device/google/gs-common/edgetpu/edgetpu.mk
 # Config variables for TPU chip on device.
 $(call soong_config_set,edgetpu_config,chip,abrolhos)
-# Include the edgetpu targets defined the namespaces below into the final image.
-PRODUCT_SOONG_NAMESPACES += \
-	vendor/google_devices/gs101/proprietary/gchips/tpu/metrics \
-	vendor/google_devices/gs101/proprietary/gchips/tpu/tflite_delegate \
-	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
+
 # TPU firmware
 PRODUCT_PACKAGES += edgetpu-abrolhos.fw
 
@@ -1091,24 +955,11 @@ endif
 # Wifi ext
 include hardware/google/pixel/wifi_ext/device.mk
 
-# Battery Stats Viewer
-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.
 # It must be split into the FCM of each partition.
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product.xml
 
-# Preopt SystemUI
-PRODUCT_DEXPREOPT_SPEED_APPS += SystemUIGoogle  # For internal
-PRODUCT_DEXPREOPT_SPEED_APPS += SystemUI  # For AOSP
-
-# Compile SystemUI on device with `speed`.
-PRODUCT_PROPERTY_OVERRIDES += \
-    dalvik.vm.systemuicompilerfilter=speed
-
 # Keymaster configuration
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.device_id_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_id_attestation.xml \
@@ -1126,3 +977,10 @@ 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>10</version>
+        <version>13-15</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-3</version>
+        <version>2-4</version>
         <interface>
             <name>IWifiExt</name>
             <instance>default</instance>

dumpstate/Android.bp

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

dumpstate/OWNERS

@@ -1,10 +0,0 @@
-aaronding@google.com
-rurumihong@google.com
-adamshih@google.com
-wilsonsung@google.com
-lucaswei@google.com
-cyanhsieh@google.com
-rogerliao@google.com
-cyuanjen@google.com
-robinpeng@google.com
-pattjin@google.com

dumpstate/dump_gs101.sh

@@ -1,292 +0,0 @@
-#!/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

@@ -0,0 +1,788 @@
+
+/*
+ * 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

@@ -0,0 +1,131 @@
+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_gs101.sh
+PRODUCT_PACKAGES += dump_power
 

evolution_common.mk

@@ -5,4 +5,7 @@
 #
 
 # PixelParts
-include packages/apps/PixelParts/device.mk
+#include packages/apps/PixelParts/device.mk
+
+# UDFPS
+TARGET_HAS_UDFPS += true

factory/framework/Android.bp

@@ -1,15 +0,0 @@
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//device/google/gs101:device_google_gs101_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: [
-        "//device/google/gs101:device_google_gs101_license",
-    ],
-}
-
-runtime_resource_overlay {
-    name: "FactoryOverlayFrameworkRes",
-    product_specific: true,
-}

factory/launcher3/Android.bp

@@ -1,15 +0,0 @@
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//device/google/gs101:device_google_gs101_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: [
-        "//device/google/gs101:device_google_gs101_license",
-    ],
-}
-
-runtime_resource_overlay {
-    name: "FactoryOverlayLauncher3",
-    product_specific: true,
-}

factory/launcher3/AndroidManifest.xml

@@ -1,25 +0,0 @@
-<?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.
--->
-<!-- Pixel specific factory overlays -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.launcher3.overlay.factory">
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.launcher3"
-      android:targetName="favorites"
-      android:isStatic="true"
-      android:priority="2"/>
-</manifest>

factory/launcher3/res/xml/default_workspace_5x5.xml

@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
-
-    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
-    <!-- Dialer, android test tool, label barcode, battery charge tool, barcode scanner -->
-    <resolve
-        launcher:container="-101"
-        launcher:screen="0"
-        launcher:x="0"
-        launcher:y="0" >
-        <favorite launcher:uri="#Intent;action=android.intent.action.DIAL;end" />
-        <favorite launcher:uri="tel:123" />
-        <favorite launcher:uri="#Intent;action=android.intent.action.CALL_BUTTON;end" />
-    </resolve>
-
-    <resolve
-        launcher:container="-101"
-        launcher:screen="1"
-        launcher:x="1"
-        launcher:y="0" >
-        <favorite
-            launcher:packageName="com.google_npi.androidtesttool"
-            launcher:className="com.google_npi.androidtesttool.MainActivity" />
-    </resolve>
-
-    <resolve
-        launcher:container="-101"
-        launcher:screen="2"
-        launcher:x="2"
-        launcher:y="0" >
-        <favorite
-            launcher:packageName="com.google_cte.labelbarcode"
-            launcher:className="com.google_cte.labelbarcode.LabelBarcodeMainActivity" />
-    </resolve>
-
-    <resolve
-        launcher:container="-101"
-        launcher:screen="3"
-        launcher:x="3"
-        launcher:y="0" >
-        <favorite
-            launcher:packageName="com.google.batterychargetool"
-            launcher:className="com.google.batterychargetool.MainActivity" />
-    </resolve>
-
-    <resolve
-        launcher:container="-101"
-        launcher:screen="4"
-        launcher:x="4"
-        launcher:y="0" >
-        <favorite
-            launcher:packageName="com.google_cte.barcodescanner"
-            launcher:className="com.google_cte.barcodescanner.MainActivity" />
-    </resolve>
-
-</favorites>

factory/settings/Android.bp

@@ -1,15 +0,0 @@
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//device/google/gs101:device_google_gs101_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: [
-        "//device/google/gs101:device_google_gs101_license",
-    ],
-}
-
-runtime_resource_overlay {
-    name: "FactoryOverlaySettings",
-    product_specific: true,
-}

factory/settings/AndroidManifest.xml

@@ -1,25 +0,0 @@
-<?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.
--->
-<!-- Pixel specific factory overlays -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.providers.settings.overlay.factory">
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.providers.settings"
-      android:targetName="resources"
-      android:isStatic="true"
-      android:priority="2"/>
-</manifest>

factory/settings/res/values/defaults.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright (c) 2009, 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>
-  <integer name="def_lockscreen_sounds_enabled">0</integer>
-  <bool name="def_lockscreen_disabled">true</bool>
-  <bool name="def_dtmf_tones_enabled">false</bool>
-  <bool name="def_sound_effects_enabled">false</bool>
-  <bool name="def_charging_sounds_enabled">false</bool>
-  <string name="def_immersive_mode_confirmations" translatable="false">confirmed</string>
-</resources>

factory_common.mk

@@ -1,84 +0,0 @@
-#
-# Copyright 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.
-#
-
-$(call inherit-product, device/google/gs101/aosp_common.mk)
-$(call inherit-product-if-exists, vendor/google_devices/gs101/factory/pixel/device-factory.mk)
-
-PRODUCT_PROPERTY_OVERRIDES += service.adb.root=1 \
-                              ro.vendor.factory=1 \
-                              ro.adb.secure=0
-
-# Factory Libraries of Audio
-PRODUCT_PACKAGES += audioroute libaudioroutelite
-
-# Enable fatp by default for factory builds
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-    persist.vendor.camera.fatp.enable=1
-
-# Disable camera related features for factory builds
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.vendor.camera.partial_result_count=1 \
-    vendor.camera.debug.bypass_face_ssd_processor=1 \
-    vendor.camera.debug.enable_face_detection=0 \
-    vendor.camera.debug.force_dpm_on=0 \
-    vendor.camera.debug.force_eis_on=0 \
-    vendor.camera.debug.force_eaf_on=0 \
-    vendor.camera.debug.force_local_tone_mapping_on=0 \
-    vendor.camera.debug.force_mesh_warp_on=0 \
-    vendor.camera.debug.force_rectiface_node_on=0 \
-    vendor.camera.debug.force_steadiface_on=0 \
-    vendor.camera.debug.force_tnr_on=0 \
-    vendor.camera.debug.local_tone_mapping_controller_v1.mode=0 \
-    vendor.camera.debug.force_segmentation_node_on=0 \
-    vendor.camera.debug.enable_saliency=0
-
-# Disable ScreenDecorations for factory builds
-PRODUCT_PROPERTY_OVERRIDES += \
-    debug.disable_screen_decorations=true
-
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=80
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_touch_timer_ms=200
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_display_power_timer_ms=1000
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_content_detection_for_refresh_rate=true
-
-# factory should always has SELinux permissive
-BOARD_BOOTCONFIG += androidboot.selinux=permissive
-BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
-
-# Disable Bluetooth as default in factory build
-DEVICE_PACKAGE_OVERLAYS += device/google/gs101/overlay-factory
-
-PRODUCT_COPY_FILES += \
-    device/google/gs101/conf/init.factory.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.factory.rc
-
-# Add factory-friendly changes
-PRODUCT_PACKAGES += \
-        FactoryOverlaySettings \
-        FactoryOverlayLauncher3 \
-        FactoryOverlayFrameworkRes
-
-# Disable DebugFS restrictions in factory builds
-PRODUCT_SET_DEBUGFS_RESTRICTIONS := false
-
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-# PixelLogger for RF testing
-PRODUCT_PACKAGES_DEBUG += \
-    PixelLogger
-
-# Tool for installing Widevine keybox
-PRODUCT_PACKAGES_DEBUG += \
-    WvInstallKeybox
-endif

fingerprint/compatibility_matrix_factory.xml

@@ -1,10 +0,0 @@
-<compatibility-matrix version="1.0" type="framework">
-    <hal format="hidl" optional="true">
-        <name>android.hardware.biometrics.fingerprint</name>
-        <version>2.1-3</version>
-        <interface>
-            <name>IBiometricsFingerprint</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</compatibility-matrix>

fingerprint/extension/Android.bp

@@ -1,15 +0,0 @@
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "device_google_gs101_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["device_google_gs101_license"],
-}
-
-sh_binary {
-    name: "fingerprint.extension.sh",
-    init_rc: ["init.fingerprint.extension.rc"],
-    src: "fingerprint.extension.sh",
-    system_ext_specific: true,
-}

fingerprint/extension/fingerprint.extension.mk

@@ -1,14 +0,0 @@
-# Fingerprint extension feature
-ifneq (,$(filter aosp% factory%, $(TARGET_PRODUCT)))
-# Skip if device is AOSP or factory build
-else
-    ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-    $(call soong_config_set,fp_hal_feature,report_bug_support,true)
-    BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/fingerprint-extension/vendor/
-    SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/fingerprint-extension/system_ext/public/
-    SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/fingerprint-extension/system_ext/private/
-    PRODUCT_PACKAGES += \
-        fps_ext_bug_lib \
-        fingerprint.extension.sh
-    endif
-endif

fingerprint/extension/fingerprint.extension.sh

@@ -1,63 +0,0 @@
-#!/system/bin/sh
-
-# BetterBug required fields
-am='am start -a com.google.android.apps.betterbug.intent.FILE_BUG_DEEPLINK --ez EXTRA_DEEPLINK true '
-issueTitle=' --es EXTRA_ISSUE_TITLE '
-additionalComment=' --es EXTRA_ADDITIONAL_COMMENT '
-componentId=' --el EXTRA_COMPONENT_ID '
-requireBugReport=' --ez EXTRA_REQUIRE_BUGREPORT '
-bugAssign=' --es EXTRA_BUG_ASSIGNEE '
-ccGroup=' --es EXTRA_CC '
-
-# BetterBug title
-kAuthTitle="UDFPS Fingerprint authentication has high failed rate"
-kLockoutTitle="UDFPS Fingerprint has too many lockout counts"
-kLatencyTitle="UDFPS Fingerprint took long to unlock device"
-
-# BetterBug context comment
-kAuthComment="This bug is auto created by fingerprint HAL to track fingerprint authentication"
-kLockoutComment="This bug is auto created by fingerprint HAL to track fingerprint lockout"
-kLatencyComment="This bug is auto created by fingerprint HAL to track fingerprint latency"
-
-# BetterBug assign & CC owner
-kBugAssign='udfps_data_study@google.com'
-kCcGroup='eddielan@google.com'
-kComponentId='817555'
-
-# Command to send intent to BetterBug
-commonCommand="$componentId ${kComponentId//\ /\\ }
-               $requireBugReport true
-               $bugAssign ${kBugAssign//\ /\\ }
-               $ccGroup ${kCcGroup//\ /\\ }"
-authCommand="$am $issueTitle ${kAuthTitle//\ /\\ }
-             $additionalComment ${kAuthComment//\ /\\ }"
-lockoutCommand="$am $issueTitle ${kLockoutTitle//\ /\\ }
-                $additionalComment ${kLockoutComment//\ /\\ }"
-latencyCommand="$am $issueTitle ${kLatencyTitle//\ /\\ }
-                $additionalComment ${kLatencyComment//\ /\\ }"
-
-# Type of bug being triggered
-# 1. Latency
-# 2. Lockout
-# 3. Finerprint authentication(FRR)
-bug_type="$1"
-
-send=1
-if [ "$bug_type" == "latency" ]; then
-  intentCommand="$latencyCommand $commonCommand"
-elif [ "$bug_type" == "lockout" ]; then
-  intentCommand="$lockoutCommand $commonCommand"
-elif [ "$bug_type" == "auth" ]; then
-  intentCommand="$authCommand $commonCommand"
-else
-  send=0
-  echo "Unknown bug_type $bug_type"
-fi
-
-if [ $send -eq 1 ]
-then
-  eval $intentCommand
-fi
-
-# Exit
-exit 0

fingerprint/extension/init.fingerprint.extension.rc

@@ -1,19 +0,0 @@
-# init-fingerprint-extension-sh is to send intent command to app
-# for tracking fingerprint issue.
-service fingerprint-extension-bug-latency /system_ext/bin/fingerprint.extension.sh latency
-    group shell
-    user shell
-    disabled
-    oneshot
-
-service fingerprint-extension-bug-lockout /system_ext/bin/fingerprint.extension.sh lockout
-    group shell
-    user shell
-    disabled
-    oneshot
-
-service fingerprint-extension-bug-auth /system_ext/bin/fingerprint.extension.sh auth
-    group shell
-    user shell
-    disabled
-    oneshot

fingerprint/fpc1540/fp_tool/Android.bp

@@ -1,28 +0,0 @@
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "device_google_gs101_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["device_google_gs101_license"],
-}
-
-cc_binary {
-    srcs: [
-        "fp_test.cpp"
-    ],
-    include_dirs: [
-        "device/google/gs101/fingerprint/fpc1540/fp_tool"
-    ],
-    name: "fp_test",
-    shared_libs: [
-        "liblog",
-        "libdl",
-        "libutils",
-        "libcutils",
-        "libhidlbase",
-        "android.hardware.biometrics.fingerprint@2.1"
-    ],
-    proprietary:true,
-
-}

fingerprint/fpc1540/fp_tool/fp_test.cpp

@@ -1,200 +0,0 @@
-#include <stdint.h>
-#include <stdio.h>
-#include <log/log.h>
-#include "fp_test.h"
-#include <cutils/properties.h>
-
-#define TAG "[FP_TEST] "
-#define LOGI(format,...) ALOGI(TAG format,##__VA_ARGS__)
-#define LOGD(format,...) ALOGD(TAG format,##__VA_ARGS__)
-#define LOGE(format,...) ALOGE(TAG format,##__VA_ARGS__)
-#define CLOGI(format,...) printf(TAG format,##__VA_ARGS__)
-#define CLOGD(format,...) printf(TAG format,##__VA_ARGS__)
-#define CLOGE(format,...) printf(TAG format,##__VA_ARGS__)
-
-#define LOGI_BOTH(format,...) {        \
-    ALOGI(TAG format,##__VA_ARGS__)       \
-    prinft(TAG format, ##__VA_ARGS__) \
-}                                     \
-
-#define ARRAY_SIZE(arr)  (sizeof(arr) / sizeof(arr[0]))
-#define STRING_SIZE 32
-
-#define FPS_SRV_PROP "fps_hal"
-#define FPS_SRV_FULL_PROP "init.svc.fps_hal"
-#define FPS_SRV_STATUS_PROP "vendor.fp.status"
-
-enum ErrorType {
-    OK,
-    ERROR
-};
-
-static const char* const cmdUsage[] = {
-    "-------fp_test tool usage--------",
-    "fp_test -e: Enable FPS service",
-    "fp_test -d: Disable FPS service",
-    "fp_test -i: Idle Mode",
-    "fp_test -n: Navigation Mode",
-    "fp_test -a: Authentication Mode",
-    "---------------------------------",
-};
-
-void toolUsage(void) {
-    int numCmdUsage = ARRAY_SIZE(cmdUsage);
-    for(int i = 0; i< numCmdUsage; i++)
-        CLOGI("%s\n",cmdUsage[i]);
-}
-
-int checkParameter(int num, char **strArray)
-{
-    int ret = 0;
-    char parameter[STRING_SIZE] = {0,};
-    if (num != 2 || (strlen(strArray[1]) > STRING_SIZE)) {
-        return -ERROR;
-    }
-    strcpy(parameter, strArray[1]);
-    if (!strncmp(parameter, "-a", sizeof("-a"))) {
-        CLOGI("Start Authentication Mode!\n");
-        LOGI("Start Authentication Mode!\n");
-        ret = 'a';
-    } else if (!strncmp(parameter, "-n", sizeof("-n"))) {
-        CLOGI("Start Navigation Mode!\n");
-        LOGI("Start Navigation Mode!\n");
-        ret = 'n';
-    } else if (!strncmp(parameter, "-i", sizeof("-i"))) {
-        CLOGI("Start Idle Mode!\n");
-        LOGI("Start Idle Mode!\n");
-        ret = 'n';
-    } else if (!strncmp(parameter, "-e", sizeof("-e"))) {
-        CLOGI("Start enabling FPS service!\n");
-        LOGI("Start enabling FPS service!\n");
-        ret = 'e';
-    } else if (!strncmp(parameter, "-d", sizeof("-d"))) {
-        CLOGI("Start disabling FPS service!\n");
-        LOGI("Start disabling FPS service!\n");
-        ret = 'd';
-    } else {
-        ret = -ERROR;
-    }
-    return ret;
-}
-
-int enable_disable_fps(bool set)
-{
-    int ret  = 0;
-    // Set property to enable/disable fingerprint service
-    if (set == true) {
-       ret = property_set("ctl.start", FPS_SRV_PROP);
-    } else {
-       ret = property_set("ctl.stop", FPS_SRV_PROP);
-    }
-
-    if (ret != 0) {
-        CLOGE("Failed to %s FPS service\n", set? "enable" : "disable");
-        LOGE("Failed to %s FPS service\n", set? "enable" : "disable");
-        return -ERROR;
-    }
-
-    return ret;
-}
-
-int run_auth_cmd() {
-    RequestStatus hidlRet;
-    uint64_t operationId = 0;
-    uint32_t gid = 0;
-    char tempbuf[PROPERTY_VALUE_MAX];
-
-    property_get(FPS_SRV_FULL_PROP, tempbuf, 0);
-    LOGE("%s : current fp service status is %s!\n",__func__, tempbuf);
-    if (!strncmp(tempbuf, "stopped", strlen("stopped"))) {
-        return -ERROR;
-    }
-
-    sp<IBiometricsFingerprint> service = IBiometricsFingerprint::getService();
-    if (service == nullptr) {
-        CLOGE("%s : Fail to get FingerprintService!\n",__func__);
-        LOGE("%s : Fail to get FingerprintService!\n",__func__);
-        return -ERROR;
-    }
-
-    hidlRet = service->authenticate(operationId, gid);
-    if (hidlRet == RequestStatus::SYS_OK) {
-        return OK;
-    } else {
-        return -ERROR;
-    }
-}
-
-int run_cancel_cmd() {
-
-    RequestStatus hidlRet;
-    char tempbuf[PROPERTY_VALUE_MAX];
-
-    property_get(FPS_SRV_FULL_PROP, tempbuf, 0);
-    LOGE("%s : current fp service status is %s!\n",__func__, tempbuf);
-    if (!strncmp(tempbuf, "stopped", strlen("stopped"))) {
-        return -ERROR;
-    }
-
-    sp<IBiometricsFingerprint> service = IBiometricsFingerprint::getService();
-    if (service == nullptr) {
-        CLOGE("%s : Fail to get FingerprintService!\n",__func__);
-        LOGE("%s : Fail to get FingerprintService!\n",__func__);
-        return -ERROR;
-    }
-
-    hidlRet = service->cancel();
-    if (hidlRet == RequestStatus::SYS_OK) {
-        return OK;
-    } else {
-        return -ERROR;
-    }
-}
-
-int main(int argc, char *argv[])
-{
-    int input=0;
-    int32_t ret = 0;
-    LOGI("%s",__func__);
-    input = checkParameter(argc, argv);
-    if (input == -ERROR){
-        LOGE("Invalid Parameter\n");
-        CLOGE("Invalid Parameter\n");
-        toolUsage();
-        return -ERROR;
-    }
-
-    switch (input) {
-        case 'e':
-            CLOGI("%s: Enable fingerprint service\n",__func__);
-            LOGI("%s: Enable fingerprint service\n",__func__);
-            ret = enable_disable_fps(true);
-            break;
-        case 'd':
-            CLOGI("%s: Disable fingerprint service\n",__func__);
-            LOGI("%s: Disable fingerprint service\n",__func__);
-            ret = enable_disable_fps(false);
-            break;
-        case 'a':
-            ret = run_auth_cmd();
-            break;
-        // For the rear fingerprint module, calling cancel() will go to the
-        // navigation mode by default.
-        // For other device not enabling naivgation feature, default mode will
-        // be "Idle" by invoking cancel().
-        case 'n':
-        case 'i':
-        default:
-            ret = run_cancel_cmd();
-            break;
-    }
-
-    if (ret != OK)
-        CLOGE("FP HIDL fail to excute cmd '%c'\n", input);
-    else
-        CLOGI("FP HIDL excute cmd '%c' successfully\n", input);
-
-    return ret;
-
-}
-

fingerprint/fpc1540/fp_tool/fp_test.h

@@ -1,16 +0,0 @@
-#ifndef FP_TEST
-#define FP_TEST
-
-#include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprint.h>
-#include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprintClientCallback.h>
-
-using android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint;
-using android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprintClientCallback;
-using android::hardware::biometrics::fingerprint::V2_1::RequestStatus;
-using android::sp;
-
-
-int main(int argc, char *argv[]);
-void toolUsage(void);
-
-#endif //FP_TEST

fingerprint/fpc1540/sw33/fingerprint_aidl_config.mk

@@ -1,18 +0,0 @@
-# ----------------------------
-# Add feature flags below
-# ----------------------------
-FPC_CONFIG_BUILD_VERSION=33_aidl
-FPC_CONFIG_GOOGLE_CUSTOMIZE=1
-FPC_CONFIG_MAX_NR_TEMPLATES=5
-FPC_CONFIG_NAVIGATION=1
-FPC_CONFIG_SENSE_TOUCH_CALIBRATION_PATH=/data/fpc/calibration_sense_touch.dat
-FPC_CONFIG_SENSORTEST=1
-FPC_CONFIG_TA_FS=1
-FPC_DEFECTIVE_PIXEL_LIST_SIZE=5000
-FPC_HAL_SHARED_LIB=1
-FPC_SENSOR_SDK_LOG_LEVEL=3
-FPC_TEE_RUNTIME=TRUSTY
-LIBFPC_NAME=libfpc1541_S_nav_debug.a
-FPC_CONFIG_DEBUG=1
-FPC_CONFIG_ENGINEERING=1
-FPC_CONFIG_PRODUCT_DEFAULT=FPC_PRODUCT_TYPE1541_S

fingerprint/fpc1540/sw33/fingerprint_hidl_config_factory.mk

@@ -1,20 +0,0 @@
-# ----------------------------
-# Add feature flags below
-# ----------------------------
-FPC_CONFIG_BUILD_VERSION=33
-FPC_CONFIG_CAPACITIVE=1
-FPC_CONFIG_MAX_NR_TEMPLATES=5
-FPC_CONFIG_NAVIGATION=0
-FPC_CONFIG_SENSE_TOUCH_CALIBRATION_PATH=/data/fpc/calibration_sense_touch.dat
-FPC_CONFIG_SENSORTEST=1
-FPC_CONFIG_TA_FS=1
-FPC_DEFECTIVE_PIXEL_LIST_SIZE=5000
-FPC_SENSOR_SDK_LOG_LEVEL=3
-FPC_TEE_RUNTIME=TRUSTY
-LIBFPC_NAME=libfpc1541_S_nav_debug.a
-FPC_CONFIG_DEBUG=1
-FPC_CONFIG_ENGINEERING=1
-FPC_CONFIG_PRODUCT_DEFAULT=FPC_PRODUCT_TYPE1541_S
-
-# Google configuration
-GOOGLE_CONFIG_FP_STATUS=1

fingerprint/fpc1540/sw33/fpc1540.mk

@@ -1,30 +0,0 @@
-# Factory build, use HIDL hal & extension so that we can use Test tool
-ifneq ( ,$(findstring factory, $(TARGET_PRODUCT)))
-include device/google/gs101/fingerprint/fpc1540/sw33/fingerprint_hidl_config_factory.mk
-PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.1-service.fpc \
-    fpc_tee_test\
-    SensorTestTool \
-    ImageTool \
-    ImageCollection \
-    fp_test \
-
-PRODUCT_PACKAGES += \
-    com.fingerprints.extension.xml \
-    com.fingerprints.extension \
-
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
-
-else
-# Non facotry build, use fingerprint AIDL version
-include device/google/gs101/fingerprint/fpc1540/sw33/fingerprint_aidl_config.mk
-
-PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint-service.fpc \
-    fingerprint.fpc \
-
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
-
-endif

fingerprint/fpc1540/sw35/fingerprint_aidl_config.mk

@@ -1,26 +0,0 @@
-# ----------------------------
-# Add feature flags below
-# ----------------------------
-FPC_BUILD_ID='ff334fee0631b7d5e424e22d18287f4f'
-FPC_CONFIG_BUILD_VERSION=35
-FPC_CONFIG_GOOGLE_CUSTOMIZE=1
-FPC_CONFIG_MAX_NR_TEMPLATES=5
-FPC_CONFIG_SENSE_TOUCH_CALIBRATION_PATH=/data/fpc/calibration_sense_touch.dat
-FPC_CONFIG_SENSORTEST=1
-FPC_CONFIG_TA_FS=1
-FPC_DEFECTIVE_PIXEL_LIST_SIZE=5000
-FPC_HAL_SHARED_LIB=1
-FPC_SENSOR_SDK_LOG_LEVEL=3
-FPC_TEE_RUNTIME=TRUSTY
-LIBFPC_NAME=libfpcmulti_debug.a
-FPC_CONFIG_DEBUG=1
-FPC_CONFIG_ENGINEERING=1
-
-FPC_CONFIG_GOOGLE_CUSTOMIZE=1
-GOOGLE_CONFIG_PERFORMANCE=1
-
-# Enable Suez
-$(call soong_config_set,fp_hal_feature,biometric_suez_support,true)
-
-# Must add below method to each project's device.mk to show sensorLocation
-#$(call soong_config_set,fp_hal_feature,pixel_product, project_XX)

fingerprint/fpc1540/sw35/fingerprint_hidl_config_factory.mk

@@ -1,20 +0,0 @@
-# ----------------------------
-# Add feature flags below
-# ----------------------------
-FPC_BUILD_ID='ff334fee0631b7d5e424e22d18287f4f'
-FPC_CONFIG_BUILD_VERSION=35
-FPC_CONFIG_GOOGLE_CUSTOMIZE=1
-FPC_CONFIG_CAPACITIVE=1
-FPC_CONFIG_MAX_NR_TEMPLATES=5
-FPC_CONFIG_SENSE_TOUCH_CALIBRATION_PATH=/data/fpc/calibration_sense_touch.dat
-FPC_CONFIG_SENSORTEST=1
-FPC_CONFIG_TA_FS=1
-FPC_DEFECTIVE_PIXEL_LIST_SIZE=5000
-FPC_SENSOR_SDK_LOG_LEVEL=3
-FPC_TEE_RUNTIME=TRUSTY
-LIBFPC_NAME=libfpcmulti_debug.a
-FPC_CONFIG_DEBUG=1
-FPC_CONFIG_ENGINEERING=1
-
-# Google config
-GOOGLE_CONFIG_FP_STATUS=1

fingerprint/fpc1540/sw35/fpc1540.mk

@@ -1,30 +0,0 @@
-# Factory build, use HIDL hal & extension so that we can use Test tool
-ifneq ( ,$(findstring factory, $(TARGET_PRODUCT)))
-include device/google/gs101/fingerprint/fpc1540/sw35/fingerprint_hidl_config_factory.mk
-PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.1-service.fpc \
-    fpc_tee_test\
-    SensorTestTool \
-    ImageTool \
-    ImageCollection \
-    fp_test \
-
-PRODUCT_PACKAGES += \
-    com.fingerprints.extension.xml \
-    com.fingerprints.extension \
-
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
-
-else
-# Non facotry build, use fingerprint AIDL version
-include device/google/gs101/fingerprint/fpc1540/sw35/fingerprint_aidl_config.mk
-
-PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint-service.fpc35 \
-    fingerprint.fpc \
-
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
-
-endif

fingerprint/fpc1540/sw42/fingerprint_aidl_config.mk

@@ -1,28 +0,0 @@
-# ----------------------------
-# Add feature flags below
-# ----------------------------
-FPC_CONFIG_BUILD_VERSION=42
-FPC_CONFIG_GOOGLE_CUSTOMIZE=1
-FPC_CONFIG_HAL_SHARED_LIB=1
-FPC_CONFIG_MAX_NR_TEMPLATES=5
-FPC_CONFIG_NO_TU=0
-FPC_CONFIG_SENSE_TOUCH_CALIBRATION_PATH=/data/fpc/calibration_sense_touch.dat
-FPC_CONFIG_SENSORTEST=1
-FPC_CONFIG_TA_FS=1
-FPC_DEFECTIVE_PIXEL_LIST_SIZE=5000
-FPC_OTP_DECODE_ERRORS_IGNORE=1
-FPC_SENSOR_SDK_LOG_LEVEL=3
-FPC_TEE_RUNTIME=TRUSTY
-LIBFPC_NAME=libfpcmulti_debug.a
-FPC_CONFIG_DEBUG=1
-FPC_CONFIG_ENGINEERING=1
-FPC_CONFIG_GOOGLE_RELEASE=1
-FPC_CONFIG_TRUSTY_CLEAN_TA=1
-
-GOOGLE_CONFIG_PERFORMANCE=1
-
-# Enable Suez
-$(call soong_config_set,fp_hal_feature,biometric_suez_support,true)
-
-# Must add below method to each project's device.mk to show sensorLocation
-#$(call soong_config_set,fp_hal_feature,pixel_product, project_XX)

fingerprint/fpc1540/sw42/fingerprint_hidl_config_factory.mk

@@ -1,18 +0,0 @@
-# ----------------------------
-# Add feature flags below
-# ----------------------------
-FPC_CONFIG_BUILD_VERSION=42
-FPC_CONFIG_GOOGLE_CUSTOMIZE=1
-FPC_CONFIG_MAX_NR_TEMPLATES=5
-FPC_CONFIG_NO_TU=0
-FPC_CONFIG_SENSE_TOUCH_CALIBRATION_PATH=/data/fpc/calibration_sense_touch.dat
-FPC_CONFIG_SENSORTEST=1
-FPC_CONFIG_TA_FS=1
-FPC_DEFECTIVE_PIXEL_LIST_SIZE=5000
-FPC_OTP_DECODE_ERRORS_IGNORE=1
-FPC_SENSOR_SDK_LOG_LEVEL=3
-FPC_TEE_RUNTIME=TRUSTY
-LIBFPC_NAME=libfpcmulti_debug.a
-FPC_CONFIG_DEBUG=1
-FPC_CONFIG_ENGINEERING=1
-

fingerprint/fpc1540/sw42/fpc1540.mk

@@ -1,30 +0,0 @@
-# Factory build, use HIDL hal & extension so that we can use Test tool
-ifneq ( ,$(findstring factory, $(TARGET_PRODUCT)))
-include device/google/gs101/fingerprint/fpc1540/sw42/fingerprint_hidl_config_factory.mk
-PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.1-service.fpc \
-    fpc_tee_test\
-    SensorTestTool \
-    ImageTool \
-    ImageCollection \
-    fp_test \
-
-PRODUCT_PACKAGES += \
-    com.fingerprints.extension.xml \
-    com.fingerprints.extension \
-
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
-
-else
-# Non facotry build, use fingerprint AIDL version
-include device/google/gs101/fingerprint/fpc1540/sw42/fingerprint_aidl_config.mk
-
-PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint-service.fpc42 \
-    fingerprint.fpc \
-
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
-
-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>3</version>
+        <version>4</version>
         <fqname>IHealth/default</fqname>
     </hal>
 </manifest>

init.hardware.wlc.rc.userdebug

@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2018 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.
-#
-
-on property:sys.boot_completed=1 && property:persist.vendor.limit.wlc.current=1
-    write /sys/class/power_supply/dc/current_max 75000
-
-on property:sys.boot_completed=1 && property:persist.vendor.limit.wlc.current=0
-    write /sys/class/power_supply/dc/current_max 1100000
-
-on property:vendor.disable.wlc=1
-    write /sys/class/power_supply/wireless/online 0

lineage_common.mk

@@ -1,6 +1,6 @@
 #
-# Copyright (C) 2021 The LineageOS Project
-#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -26,6 +26,10 @@ 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
@@ -34,5 +38,9 @@ PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS += \
 PRODUCT_PACKAGES += \
     GoogleParts
 
+# Tethering
+PRODUCT_PACKAGES += \
+    TetheringOverlay
+
 # Touch
 include hardware/google/pixel/touch/device.mk

linker.config.json

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

location/lhd.conf

@@ -1,34 +0,0 @@
-LheName=bbd
-
-LheRsmResetTimeoutMS=10000
-GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby
-
-LhePatch=/vendor/firmware/SensorHub.patch
-Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
-LheConsole=/data/vendor/gps/LheConsole
-
-LogEnabled=true
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-
-LheBbdPacket=/dev/ttyBCM
-
-LheBbdControl=/dev/bbd_control
-
-# LheBbdSensor=/dev/bbd_sensor
-
-LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt
-LogLevel=*:I
-
-NvStorageDir=/data/vendor/gps/
-
-# Enable BBD debugging at these stages:
-# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
-
-LheAutoBaudDelayMS=10
-TrafficLogEnabled=false
-SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf
-
-SkipSensorWakeLock=true
-LoggerWakeLockEnable=false
-PpsEnable=true

location/scd.conf

@@ -1,6 +0,0 @@
-LogEnabled=true
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-NvStorageDir=/data/vendor/gps/
-TcpConnectionTimeout=20
-SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf

manifest.xml

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

manifest_media_aosp.xml

@@ -8,4 +8,9 @@
             <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="2x2" />
+            <Limit name="alignment" value="1x1" />
             <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="2x2" />
+            <Limit name="alignment" value="1x1" />
             <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="2x2" />
+            <Limit name="alignment" value="1x1" />
             <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="2x2" />
+            <Limit name="alignment" value="1x1" />
             <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="2x2" />
+            <Limit name="alignment" value="1x1" />
             <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="2x2" />
+          <Limit name="alignment" value="1x1" />
           <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="2x2" />
+          <Limit name="alignment" value="1x1" />
           <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="342-351" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-320x240" range="542-971" /> <!-- v90%=1.0 -->
             <!-- measured 90%:142-147 med:143 N=2 -->
-            <Limit name="measured-frame-rate-720x480" range="142-145" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-720x480" range="162-301" /> <!-- v90%=1.0 -->
             <!-- measured 90%:54-56 med:55 N=2 -->
-            <Limit name="measured-frame-rate-1280x720" range="54-55" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-1280x720" range="54-77" /> <!-- v90%=1.0 -->
             <!-- measured 90%:25-26 med:26 N=2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="25-26" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-1920x1080" range="25-34" /> <!-- v90%=1.0 -->
         </MediaCodec>
         <MediaCodec name="c2.android.hevc.decoder" type="video/hevc" update="true">
-            <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 -->
+            <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 -->
         </MediaCodec>
         <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true">
             <Limit name="measured-frame-rate-176x144" range="1215-1823" />

modem/userdebug.mk

@@ -1,4 +0,0 @@
-ifneq ($(BOARD_WITHOUT_RADIO),true)
-  PRODUCT_PACKAGES += vcd
-endif
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101/sepolicy/modem/userdebug/

overlay-factory/frameworks/base/packages/SettingsProvider/res/values/defaults.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright (c) 2009, 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>
-    <!-- Don't enable BT until user wants it -->
-    <bool name="def_bluetooth_on">false</bool>
-</resources>
-

overlay-factory/vendor/google/apps/PixelLogger/res/values/arrays.xml

@@ -1,7 +0,0 @@
-<resources>
-    <string-array name="logger_entries">
-        <item>shannondm</item>
-        <item>cnss_diag</item>
-        <item>brcm_gps</item>
-    </string-array>
-</resources>

overlay-factory/vendor/google/apps/PixelLogger/res/values/config.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="config_logger_default_value" translatable="false">shannondm</string>
-    <string name="config_cfg_default_value" translatable="false">Built-in Mask #1</string>
-
-    <!-- default config file for cnss_diag logger -->
-    <string name="config_cfg_default_value_cnss_diag" translatable="false">cnss_diag.conf</string>
-    <!-- config file to enable brcm gps logger -->
-    <bool name="config_brcm_gps_enabled" translatable="false">true</bool>
-</resources>

overlay-factory/vendor/google/apps/PixelLogger/res/values/configmessages.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string-array name="config_message_no_message">
-    <item></item>
-  </string-array>
-  <string-array name="config_message_audio_warning">
-    <item>This will collect audio from your voice calls. Would you like to proceed?</item>
-  </string-array>
-  <string-array name="config_message_possible_audio_warning">
-    <item>This may collect audio from your voice calls. Would you like to proceed?</item>
-    <item>Pixel_Default.nprf</item>
-    <item>Built-in Mask #0</item>
-    <item>Built-in Mask #1</item>
-    <item>Built-in Mask #2</item>
-    <item>Built-in Mask #3</item>
-  </string-array>
-  <string name="config_privacy_warning_title">Privacy Warning</string>
-  <string name="default_config_selection_message">You are loading a user defined logging config. This may collect audio from your voice calls. Would you like to proceed?</string>
-</resources>

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

@@ -31,6 +31,16 @@
         <!-- B y-intercept --> <item>-0.349361641294833436</item>
     </string-array>
 
+    <!-- The fixed keyboard vibration strength in [0,1], or -1 to indicate the strength not fixed
+         and should depend on the touch feedback intensity user setting -->
+    <item name="config_keyboardHapticFeedbackFixedAmplitude" type="dimen">0.62</item>
+
+    <!-- Indicating if keyboard vibration settings supported or not. -->
+    <bool name="config_keyboardVibrationSettingsSupported">true</bool>
+
+    <!-- Indicating if ringtone vibration settings supported or not. -->
+    <bool name="config_ringtoneVibrationSettingsSupported">true</bool>
+
     <!-- List of comma separated package names for which we the system will not show crash, ANR,
          etc. dialogs. -->
     <string translatable="false" name="config_appsNotReportingCrashes">com.google.android.euicc</string>

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

@@ -20,27 +20,32 @@
         <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=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__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__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=false</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_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>
@@ -50,7 +55,9 @@
         <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__supported_languages=en-US;fr-FR;it-IT;de-DE;ja-JP;es-ES</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__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>
@@ -58,12 +65,23 @@
 
         <!-- 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=3082:https://storage.googleapis.com/music-iq-db/updatable_db_v3/20240421-030101/manifest.json</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_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>
@@ -72,11 +90,12 @@
         <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=true</item>
+        <item>device_personalization_services/NowPlaying__on_demand_enable_eager_prompt=false</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) -->
@@ -101,11 +120,13 @@
         <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=false</item>
+        <item>device_personalization_services/Translate__enable_default_langid_model=true</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,12 +229,6 @@
         <item>"/system_ext/priv-app/SystemUI/SystemUI.apk"</item>
     </string-array>
 
-    <!-- Should the pinner service pin the Home application? -->
-    <bool name="config_pinnerHomeApp">true</bool>
-
-     <!-- Bytes that the PinnerService will pin for WebView -->
-    <integer name="config_pinnerWebviewPinBytes">20971520</integer>
-
     <!-- The default intensity level for alarm vibrations. See
          Settings.System.ALARM_VIBRATION_INTENSITY more details on the constant values and
          meanings. -->
@@ -264,6 +258,9 @@
     <!-- 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
@@ -300,4 +297,8 @@
 
     <!-- Pre-scale volume at volume step 3 for Absolute Volume -->
     <fraction name="config_prescaleAbsoluteVolume_index3">100%</fraction>
-  </resources>
+
+    <!-- Whether to enable usb state update via udc sysfs. -->
+    <bool name="config_enableUdcSysfsUsbStateUpdate">true</bool>
+
+</resources>

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

@@ -1,22 +0,0 @@
-<?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

@@ -1,22 +0,0 @@
-<?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/Android.bp

@@ -1,42 +0,0 @@
-//
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//device/google/gs101:device_google_gs101_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: [
-        "//device/google/gs101:device_google_gs101_license",
-    ],
-}
-
-cc_binary {
-  name: "pixelstats-vendor",
-  init_rc: ["pixelstats-vendor.gs101.rc"],
-  srcs: [
-    "service.cpp",
-  ],
-  shared_libs: [
-    "libbase",
-    "liblog",
-    "libutils",
-    "libpixelstats",
-  ],
-  proprietary: true,
-  static_libs: ["chre_client"],
-  header_libs: ["chre_api"],
-}

pixelstats/pixelstats-vendor.gs101.rc

@@ -1,10 +0,0 @@
-on property:sys.boot_completed=1
-	chown system system /sys/class/power_supply/maxfg/fg_learning_events
-	start vendor.pixelstats_vendor
-on post-fs-data
-    chown system system /sys/kernel/metrics/irq/stats_reset
-service vendor.pixelstats_vendor /vendor/bin/pixelstats-vendor
-    class hal
-    user system
-    group system context_hub readproc
-    disabled

pixelstats/service.cpp

@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "pixelstats"
-
-#include <android-base/logging.h>
-#include <pixelstats/SysfsCollector.h>
-#include <pixelstats/UeventListener.h>
-
-#include <thread>
-
-using android::hardware::google::pixel::SysfsCollector;
-using android::hardware::google::pixel::UeventListener;
-
-#define BLOCK_STATS_LENGTH 17
-#define UFSHC_PATH(filename) "/dev/sys/block/bootdevice/" #filename
-#define UFS_ERR_PATH(err_type) UFSHC_PATH(err_stats/) #err_type
-const struct SysfsCollector::SysfsPaths sysfs_paths = {
-        .SlowioReadCntPath = UFSHC_PATH(slowio_read_cnt),
-        .SlowioWriteCntPath = UFSHC_PATH(slowio_write_cnt),
-        .SlowioUnmapCntPath = UFSHC_PATH(slowio_unmap_cnt),
-        .SlowioSyncCntPath = UFSHC_PATH(slowio_sync_cnt),
-        .CycleCountBinsPath = "/sys/class/power_supply/battery/cycle_counts",
-        .UFSLifetimeA = UFSHC_PATH(health_descriptor/life_time_estimation_a),
-        .UFSLifetimeB = UFSHC_PATH(health_descriptor/life_time_estimation_b),
-        .UFSLifetimeC = UFSHC_PATH(health_descriptor/life_time_estimation_c),
-        .F2fsStatsPath = "/sys/fs/f2fs/",
-        .ImpedancePath = "/sys/devices/platform/audiometrics/speaker_impedance",
-        .CodecPath = "/sys/devices/platform/audiometrics/codec_state",
-        .EEPROMPath = "/dev/battery_history",
-        .MitigationPath = "/sys/devices/virtual/pmic/mitigation",
-        .SpeakerTemperaturePath = "/sys/devices/platform/audiometrics/speaker_temp",
-        .SpeakerExcursionPath = "/sys/devices/platform/audiometrics/speaker_excursion",
-        .SpeakerHeartBeatPath = "/sys/devices/platform/audiometrics/speaker_heartbeat",
-        .ResumeLatencyMetricsPath = "/sys/kernel/metrics/resume_latency/resume_latency_metrics",
-        .LongIRQMetricsPath = "/sys/kernel/metrics/irq/long_irq_metrics",
-        .StormIRQMetricsPath = "/sys/kernel/metrics/irq/storm_irq_metrics",
-        .IRQStatsResetPath = "/sys/kernel/metrics/irq/stats_reset",
-        .UFSErrStatsPath = {
-            UFS_ERR_PATH(pa_err_count),
-            UFS_ERR_PATH(dl_err_count),
-            UFS_ERR_PATH(nl_err_count),
-            UFS_ERR_PATH(tl_err_count),
-            UFS_ERR_PATH(dme_err_count),
-            UFS_ERR_PATH(fatal_err_count),
-            UFS_ERR_PATH(auto_hibern8_err_count)
-        },
-        .AmsRatePath = "/sys/devices/platform/audiometrics/ams_rate_read_once",
-        .TempResidencyAndResetPaths = {
-            {
-                "/sys/kernel/metrics/thermal/tr_by_group/tmu/stats",
-                "/sys/kernel/metrics/thermal/tr_by_group/tmu/stats_reset"
-            },
-            {
-                "/sys/kernel/metrics/thermal/tr_by_group/spmic/stats",
-                "/sys/kernel/metrics/thermal/tr_by_group/spmic/stats_reset"
-            }
-        },
-        .GMSRPath = {
-            "/sys/class/power_supply/maxfg/gmsr",
-            "/sys/class/power_supply/maxfg_base/gmsr",
-        },
-};
-
-const struct UeventListener::UeventPaths ueventPaths = {
-        .AudioUevent = "/devices/virtual/amcs/amcs",
-        .TypeCPartnerUevent = "PRODUCT_TYPE=",
-        .FGLearningPath = {
-            "/sys/class/power_supply/maxfg/fg_learning_events"
-        },
-        .FwUpdatePath = "",
-        .FGModelLoadingPath = {
-            "/sys/class/power_supply/maxfg/m5_model_state"
-        }
-};
-
-int main() {
-    LOG(INFO) << "starting PixelStats";
-
-    UeventListener ueventListener(ueventPaths);
-    std::thread listenThread(&UeventListener::ListenForever, &ueventListener);
-    listenThread.detach();
-
-    SysfsCollector collector(sysfs_paths);
-    collector.collect();  // This blocks forever.
-
-    return 0;
-}

pkvm/pkvm_enabler.c

@@ -24,7 +24,6 @@
 
 #include <log/log.h>
 
-#define KVM_DEVICE  "/dev/kvm"
 #define MISC_WRITER "/vendor/bin/misc_writer"
 
 int main() {
@@ -33,22 +32,7 @@ int main() {
     pid_t pid;
     int ret, wstatus;
 
-    /* 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.
-     */
+    /* 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,5 +2,10 @@ service pkvm_enabler /vendor/bin/pkvm_enabler
     reboot_on_failure reboot,pkvm-not-enabled
     user root
 
-on early-init
+# 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
     exec_start pkvm_enabler

powerhint_a1.json

@@ -369,18 +369,6 @@
       "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<const std::string> deviceNames { "s2mpg10-odpm", "s2mpg11-odpm" };
+    std::vector<std::string> deviceNames { "s2mpg10-odpm", "s2mpg11-odpm" };
     p->setEnergyMeterDataProvider(std::make_unique<IioEnergyMeterDataProvider>(deviceNames, true));
 }
 

preinstalled-packages-product-gs101-device-debug.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-<!-- System packages to preinstall on gs101 debug devices, per user type.
-     Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml
--->
-<config>
-    <!-- Battery Stats Viewer (BatteryStatsViewer) -->
-    <install-in-user-type package="com.android.frameworks.core.batterystatsviewer">
-        <install-in user-type="FULL" />
-        <install-in user-type="PROFILE" />
-        <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
-        <do-not-install-in user-type="android.os.usertype.profile.PRIVATE" />
-    </install-in-user-type>
-</config>

rro_overlays/TetheringOverlay/Android.bp

@@ -0,0 +1,9 @@
+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,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 The Android Open Source Project
+<!-- 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.
@@ -13,12 +13,15 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<!-- Pixel specific factory overlays -->
+<!-- Pixel specific tethering overlays -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.frameworkres.overlay.factory">
+    package="com.android.networkstack.tethering.overlay"
+    android:versionCode="1"
+    android:versionName="1.0">
     <application android:hasCode="false" />
     <overlay
-      android:targetPackage="android"
-      android:isStatic="true"
-      android:priority="2"/>
+        android:targetPackage="com.android.networkstack.tethering"
+        android:targetName="TetheringConfig"
+        android:isStatic="true"
+        android:priority="0" />
 </manifest>

rro_overlays/TetheringOverlay/res/values/config.xml

@@ -0,0 +1,46 @@
+<?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/OWNERS

@@ -1,5 +0,0 @@
-# People who can approve changes for submission
-etancohen@google.com
-arabawy@google.com
-kumachang@google.com
-satk@google.com

rro_overlays/WifiOverlay/res/values/config.xml

@@ -161,4 +161,12 @@
          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,12 +2,14 @@ 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,9 +1,6 @@
 # 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
 
@@ -11,7 +8,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_SEPOLICY_DIRS += device/google/gs101/sepolicy/whitechapel/vendor/google
+BOARD_VENDOR_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
@@ -32,9 +29,6 @@ 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,2 +1,5 @@
 # Oriole only sepolicy
-BOARD_SEPOLICY_DIRS += device/google/gs101-sepolicy/oriole
+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

sepolicy/raven-sepolicy.mk

@@ -1,2 +1,5 @@
 # Ravne only sepolicy
-BOARD_SEPOLICY_DIRS += device/google/gs101-sepolicy/raven
+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

sepolicy/system_ext/private/pixelntnservice_app.te

@@ -0,0 +1,5 @@
+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,4 +5,5 @@ 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,3 +6,6 @@ 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

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

sepolicy/system_ext/public/property.te

@@ -6,7 +6,8 @@ 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/telephony/pktrouter/device.te

@@ -1 +0,0 @@
-type pktrouter_device, dev_type;

sepolicy/telephony/pktrouter/file_contexts

@@ -1,4 +0,0 @@
-# WFC
-/vendor/bin/wfc-pkt-router     u:object_r:pktrouter_exec:s0
-
-/dev/umts_wfc[01]              u:object_r:pktrouter_device:s0

sepolicy/telephony/pktrouter/netutils_wrapper.te

@@ -1,7 +0,0 @@
-allow netutils_wrapper pktrouter:fd use;
-allow netutils_wrapper pktrouter:fifo_file write;
-allow netutils_wrapper pktrouter:netlink_route_socket { read write };
-allow netutils_wrapper pktrouter:packet_socket { read write };
-allow netutils_wrapper pktrouter:rawip_socket { read write };
-allow netutils_wrapper pktrouter:udp_socket { read write };
-allow netutils_wrapper pktrouter_device:chr_file rw_file_perms;

sepolicy/telephony/pktrouter/pktrouter.te

@@ -1,14 +0,0 @@
-type pktrouter, domain;
-type pktrouter_exec, vendor_file_type, exec_type, file_type;
-init_daemon_domain(pktrouter)
-net_domain(pktrouter)
-
-domain_auto_trans(pktrouter, netutils_wrapper_exec, netutils_wrapper);
-
-allow pktrouter pktrouter_device:chr_file rw_file_perms;
-allow pktrouter radio_device:chr_file r_file_perms;
-allow pktrouter self:netlink_route_socket nlmsg_write;
-allow pktrouter self:packet_socket { bind create read write getattr shutdown};
-allow pktrouter self:capability net_raw;
-
-get_prop(pktrouter, vendor_ims_prop);

sepolicy/telephony/pktrouter/property.te

@@ -1 +0,0 @@
-vendor_internal_prop(vendor_ims_prop)

sepolicy/telephony/pktrouter/property_contexts

@@ -1,3 +0,0 @@
-# for ims service
-vendor.pktrouter              u:object_r:vendor_ims_prop:s0
-