gs201: Initialize for Evolution X 11.x

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

Android.bp

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

BoardConfig-common.mk

@@ -22,7 +22,7 @@ TARGET_SOC := gs201
 TARGET_SOC_NAME := google
 
 USES_DEVICE_GOOGLE_GS201 := true
-$(call soong_config_set,CitadelProvision,target_soc,gs201)
+$(call soong_config_set,googleDeviceConfig,target_soc,gs201)
 
 TARGET_ARCH := arm64
 TARGET_ARCH_VARIANT := armv8-2a
@@ -46,7 +46,6 @@ TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a53
 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 += cgroup_disable=memory
 BOARD_KERNEL_CMDLINE += rcupdate.rcu_expedited=1 rcu_nocbs=all rcutree.enable_rcu_lazy
 BOARD_KERNEL_CMDLINE += stack_depot_disable=off page_pinner=on
 BOARD_KERNEL_CMDLINE += swiotlb=1024
@@ -237,12 +236,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
@@ -439,8 +432,5 @@ BOARD_KERNEL_CMDLINE += log_buf_len=1024K
 # Protected VM firmware
 BOARD_PVMFWIMAGE_PARTITION_SIZE := 0x00100000
 
-# pick up library for cleaning digital car keys on factory reset
--include vendor/google_devices/gs-common/proprietary/BoardConfigVendor.mk
-
 include device/google/gs201/BoardConfigLineage.mk
 include device/google/gs201/BoardConfigEvolution.mk

BoardConfigLineage.mk

@@ -5,7 +5,6 @@
 #
 
 # Manifests
-DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += vendor/lineage/config/device_framework_matrix.xml
 DEVICE_MANIFEST_FILE += device/google/gs201/android.hardware.security.rkp-service.citadel.xml
 ifneq ($(BOARD_WITHOUT_RADIO),true)
 DEVICE_MANIFEST_FILE += device/google/gs201/manifest_radio_ds.xml

CleanSpec.mk

@@ -1,85 +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)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.usb.gadget-service)
-$(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.rc)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.usb-servic.xml)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.usb.gadget-servic.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.gs201)
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/etc/init/android.hardware.power.stats@1.0-service.gs201.rc)
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.power.stats@1.0-service.gs201.xml)
-
-# 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,2 +0,0 @@
-# per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
-per-file *.mk,{**/,}Android.bp=file:device/google/gs-common:main:/MK_OWNERS

PREUPLOAD.cfg

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

aosp_common.mk

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

conf/OWNERS

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

conf/init.check_ap_pd_auth.sh

@@ -1,15 +0,0 @@
-#!/vendor/bin/sh
-
-# This script sets up `ro.vendor.sjtag_ap_is_unlocked` for the non-fused
-# device. For a fused device, this property should be set by
-# betterbug->ss-restart-detector when PD is acquired.
-
-SJTAG_STATUS=0x$(cat /sys/devices/platform/sjtag_ap/interface/status)
-SOFT_LOCK_BIT=4
-AUTH_PASS_BIT=8
-
-# Unlocked or locked but auth passed.
-if test "$((SJTAG_STATUS & (1 << SOFT_LOCK_BIT)))" = 0 -o \
-    "$((SJTAG_STATUS & (1 << AUTH_PASS_BIT)))" != 0 ; then
-  setprop ro.vendor.sjtag_ap_is_unlocked true
-fi

conf/init.debug.rc

@@ -1,60 +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
-
-# HSUM separated main user from the SYSTEM user, granting write permissions
-# for write only SJTAG sysfs files
-    chmod 220 /sys/devices/platform/sjtag_ap/interface/auth
-    chmod 220 /sys/devices/platform/sjtag_ap/interface/begin
-    chmod 220 /sys/devices/platform/sjtag_ap/interface/end
-    chmod 220 /sys/devices/platform/sjtag_gsa/interface/auth
-    chmod 220 /sys/devices/platform/sjtag_gsa/interface/begin
-    chmod 220 /sys/devices/platform/sjtag_gsa/interface/end
-
-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
-
-# Bluetooth
-on post-fs-data
-    chown bluetooth system /dev/logbuffer_btlpm
-    chown bluetooth system /dev/logbuffer_btpower
-    chown bluetooth system /dev/logbuffer_tty18
-
-# pKVM performance is different on A0 and B0 chips.
-# Add extra tag to metrics collected on A0 to separate the results.
-on property:ro.revision=PROTO1.0
-    setprop debug.hypervisor.metrics_tag "hwrev_a0"
-on property:ro.revision=PROTO1.1
-    setprop debug.hypervisor.metrics_tag "hwrev_a0"
-on property:ro.revision=EVT1.0
-    setprop debug.hypervisor.metrics_tag "hwrev_a0"
-
-service vendor.check_ap_pd_auth_sh /vendor/bin/init.check_ap_pd_auth.sh
-    class main
-    user root
-    group root system
-    oneshot
-
-# Enable etm/etm2dram when ramdump is enabled, and ap-sjtag is unlocked.
-on property:ro.boot.ramdump=enabled && property:ro.vendor.sjtag_ap_is_unlocked=true
-    write /sys/devices/platform/exynos-etm/etm_on 1
-    write /sys/devices/platform/etm2dram/arm 1

conf/init.gs201.rc

@@ -19,36 +19,6 @@ on init
     # Disable util-awareness
     write /proc/vendor_sched/teo_util_threshold "1024 1024 1024"
 
-    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 /proc/vendor_sched/uclamp_fork_reset_clear
-    chown system system /proc/vendor_sched/uclamp_fork_reset_set
     chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold
     chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold
     chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency
@@ -70,116 +40,8 @@ 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 0660 /proc/vendor_sched/pmu_poll_enable
-    chmod 0220 /proc/vendor_sched/pmu_poll_time
-    chmod 0220 /proc/vendor_sched/uclamp_fork_reset_clear
-    chmod 0220 /proc/vendor_sched/uclamp_fork_reset_set
-
     start vendor.keymaster-4-0
 
-    # Change permission of sched qos nodes
-    chown system system /proc/vendor_sched/sched_qos/adpf_set
-    chown system system /proc/vendor_sched/sched_qos/adpf_clear
-    chown system system /proc/vendor_sched/sched_qos/auto_uclamp_max_set
-    chown system system /proc/vendor_sched/sched_qos/auto_uclamp_max_clear
-    chown system system /proc/vendor_sched/sched_qos/boost_prio_set
-    chown system system /proc/vendor_sched/sched_qos/boost_prio_clear
-    chown system system /proc/vendor_sched/sched_qos/preempt_wakeup_set
-    chown system system /proc/vendor_sched/sched_qos/preempt_wakeup_clear
-    chown system system /proc/vendor_sched/sched_qos/prefer_fit_set
-    chown system system /proc/vendor_sched/sched_qos/prefer_fit_clear
-    chown system system /proc/vendor_sched/sched_qos/prefer_high_cap_set
-    chown system system /proc/vendor_sched/sched_qos/prefer_high_cap_clear
-    chown system system /proc/vendor_sched/sched_qos/prefer_idle_set
-    chown system system /proc/vendor_sched/sched_qos/prefer_idle_clear
-    chown system system /proc/vendor_sched/sched_qos/rampup_multiplier_set
-    chown system system /proc/vendor_sched/sched_qos/rampup_multiplier_clear
-
-    chmod 0220 /proc/vendor_sched/sched_qos/adpf_set
-    chmod 0220 /proc/vendor_sched/sched_qos/adpf_clear
-    chmod 0220 /proc/vendor_sched/sched_qos/auto_uclamp_max_set
-    chmod 0220 /proc/vendor_sched/sched_qos/auto_uclamp_max_clear
-    chmod 0220 /proc/vendor_sched/sched_qos/boost_prio_set
-    chmod 0220 /proc/vendor_sched/sched_qos/boost_prio_clear
-    chmod 0220 /proc/vendor_sched/sched_qos/preempt_wakeup_set
-    chmod 0220 /proc/vendor_sched/sched_qos/preempt_wakeup_clear
-    chmod 0220 /proc/vendor_sched/sched_qos/prefer_fit_set
-    chmod 0220 /proc/vendor_sched/sched_qos/prefer_fit_clear
-    chmod 0220 /proc/vendor_sched/sched_qos/prefer_high_cap_set
-    chmod 0220 /proc/vendor_sched/sched_qos/prefer_high_cap_clear
-    chmod 0220 /proc/vendor_sched/sched_qos/prefer_idle_set
-    chmod 0220 /proc/vendor_sched/sched_qos/prefer_idle_clear
-    chmod 0220 /proc/vendor_sched/sched_qos/rampup_multiplier_set
-    chmod 0220 /proc/vendor_sched/sched_qos/rampup_multiplier_clear
-
-    # Enable sched_qos for some groups
-    write /proc/vendor_sched/groups/ta/qos_adpf_enable 1
-    write /proc/vendor_sched/groups/ta/qos_auto_uclamp_max_enable 1
-    write /proc/vendor_sched/groups/ta/qos_boost_prio_enable 1
-    write /proc/vendor_sched/groups/ta/qos_preempt_wakeup_enable 1
-    write /proc/vendor_sched/groups/ta/qos_prefer_fit_enable 1
-    write /proc/vendor_sched/groups/ta/qos_prefer_high_cap_enable 1
-    write /proc/vendor_sched/groups/ta/qos_prefer_idle_enable 1
-    write /proc/vendor_sched/groups/ta/qos_rampup_multiplier_enable 1
-    write /proc/vendor_sched/groups/fg/qos_adpf_enable 1
-    write /proc/vendor_sched/groups/fg/qos_auto_uclamp_max_enable 1
-    write /proc/vendor_sched/groups/fg/qos_boost_prio_enable 1
-    write /proc/vendor_sched/groups/fg/qos_preempt_wakeup_enable 1
-    write /proc/vendor_sched/groups/fg/qos_prefer_fit_enable 1
-    write /proc/vendor_sched/groups/fg/qos_prefer_high_cap_enable 1
-    write /proc/vendor_sched/groups/fg/qos_prefer_idle_enable 1
-    write /proc/vendor_sched/groups/fg/qos_rampup_multiplier_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_adpf_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_auto_uclamp_max_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_boost_prio_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_preempt_wakeup_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_prefer_fit_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_prefer_high_cap_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_prefer_idle_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_rampup_multiplier_enable 1
-    write /proc/vendor_sched/groups/cam/qos_adpf_enable 1
-    write /proc/vendor_sched/groups/cam/qos_auto_uclamp_max_enable 1
-    write /proc/vendor_sched/groups/cam/qos_prefer_fit_enable 1
-    write /proc/vendor_sched/groups/cam/qos_prefer_high_cap_enable 1
-    write /proc/vendor_sched/groups/cam/qos_prefer_idle_enable 1
-    write /proc/vendor_sched/groups/cam/qos_rampup_multiplier_enable 1
-    write /proc/vendor_sched/groups/cam_power/qos_adpf_enable 1
-    write /proc/vendor_sched/groups/cam_power/qos_auto_uclamp_max_enable 1
-    write /proc/vendor_sched/groups/cam_power/qos_prefer_fit_enable 1
-    write /proc/vendor_sched/groups/cam_power/qos_prefer_high_cap_enable 1
-    write /proc/vendor_sched/groups/cam_power/qos_prefer_idle_enable 1
-    write /proc/vendor_sched/groups/cam_power/qos_rampup_multiplier_enable 1
-    write /proc/vendor_sched/groups/rt/qos_adpf_enable 1
-    write /proc/vendor_sched/groups/rt/qos_rampup_multiplier_enable 1
-    write /proc/vendor_sched/groups/sf/qos_adpf_enable 1
-    write /proc/vendor_sched/groups/sf/qos_rampup_multiplier_enable 1
-
     # ZRAM setup
     write /sys/block/zram0/comp_algorithm lz77eh
     write /proc/sys/vm/page-cluster 0
@@ -245,15 +107,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
@@ -272,11 +125,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
@@ -372,10 +220,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
@@ -752,33 +596,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 scheduler parameters
-    write /proc/vendor_sched/min_granularity_ns 1000000
-    write /proc/vendor_sched/latency_ns 8000000
-    write /proc/vendor_sched/max_load_balance_interval 1
-    write /proc/vendor_sched/enable_hrtick 1
-
-    # Setup final cpu.uclamp
-    write /proc/vendor_sched/groups/ta/uclamp_min 1
-    write /proc/vendor_sched/groups/fg/uclamp_min 0
-    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
@@ -797,12 +621,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
-
     # Make devices on the critical path for suspend/resume asynchronous
     write /sys/devices/platform/acpm_mfd_bus@18110000/i2c-21/21-002f/power/async "enabled"
     write /sys/devices/platform/acpm_mfd_bus@18110000/i2c-21/power/async "enabled"
@@ -818,18 +636,6 @@ on property:sys.boot_completed=1
     write /sys/devices/platform/18062080.pd-hsi0/power/async "enabled"
     write /sys/devices/platform/14460000.pinctrl/power/async "enabled"
 
-    # 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
 
@@ -920,6 +726,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
@@ -1085,6 +892,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=*
@@ -1093,3 +902,14 @@ on property:persist.device_config.vendor_system_native.restricted_cpuset=*
     write /dev/cpuset/restricted/cpus ${persist.device_config.vendor_system_native.restricted_cpuset:-0-3}
 on property:persist.device_config.vendor_system_native.camera-daemon_cpuset=*
     write /dev/cpuset/camera-daemon/cpus ${persist.device_config.vendor_system_native.camera-daemon_cpuset:-0-7}
+
+# 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.gs201.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

device-common.mk

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

device.mk

@@ -19,13 +19,15 @@ include device/google/gs-common/gs_watchdogd/watchdog.mk
 include device/google/gs-common/ramdump_and_coredump/ramdump_and_coredump.mk
 include device/google/gs-common/soc/soc.mk
 include device/google/gs-common/soc/freq.mk
-include device/google/gs-common/modem/modem.mk
+ifneq ($(BOARD_WITHOUT_RADIO),true)
+  include device/google/gs-common/modem/modem.mk
+endif
 include device/google/gs-common/aoc/aoc.mk
 include device/google/gs-common/thermal/dump/thermal.mk
 include device/google/gs-common/thermal/thermal_hal/device.mk
 include device/google/gs-common/pixel_metrics/pixel_metrics.mk
 include device/google/gs-common/performance/perf.mk
-include device/google/gs-common/display/dump.mk
+include device/google/gs-common/display/dump_exynos_display.mk
 include device/google/gs-common/camera/dump.mk
 include device/google/gs-common/gxp/gxp.mk
 include device/google/gs-common/gps/dump/log.mk
@@ -35,13 +37,13 @@ include device/google/gs-common/gear/dumpstate/aidl.mk
 include device/google/gs-common/widevine/widevine.mk
 include device/google/gs-common/sota_app/factoryota.mk
 include device/google/gs-common/misc_writer/misc_writer.mk
-include device/google/gs-common/gyotaku_app/gyotaku.mk
 include device/google/gs-common/bootctrl/bootctrl_aidl.mk
 include device/google/gs-common/betterbug/betterbug.mk
-ifneq ($(filter cheetah felix panther, $(TARGET_PRODUCT)),)
+ifneq ($(filter %_cheetah %_felix %_panther, $(TARGET_PRODUCT)),)
   include device/google/gs-common/bcmbt/dump/dumplog.mk
 endif
 include device/google/gs-common/fingerprint/fingerprint.mk
+include device/google/gs-common/nfc/nfc.mk
 
 TARGET_BOARD_PLATFORM := gs201
 
@@ -52,10 +54,10 @@ 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
 
 # TODO(b/207450311): Remove this flag once implemented
 USE_PIXEL_GRALLOC := false
@@ -65,22 +67,10 @@ endif
 
 PRODUCT_SOONG_NAMESPACES += \
 	hardware/google/av \
-	hardware/google/gchips \
-	hardware/google/gchips/gralloc4 \
-	hardware/google/graphics/common \
-	hardware/google/graphics/gs201 \
 	hardware/google/interfaces \
 	hardware/google/pixel \
 	device/google/gs201 \
-	device/google/gs201/powerstats \
-	vendor/google_devices/common/chre/host/hal \
-	vendor/google/whitechapel/tools \
-	vendor/google/interfaces \
-	vendor/google_nos/host/android \
-	vendor/google_nos/test/system-test-harness \
-	vendor/google/camera
-
-LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
+	device/google/gs201/powerstats
 
 ifeq ($(RELEASE_AVF_ENABLE_LLPVM_CHANGES),true)
 	# Set the environment variable to enable the Secretkeeper HAL service.
@@ -91,41 +81,6 @@ endif
 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/gs201/modem/userdebug.mk
-endif
-
-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 \
@@ -212,7 +167,6 @@ USE_LASSEN_OEMHOOK := true
 # The "power-anomaly-sitril" is added into PRODUCT_SOONG_NAMESPACES when
 # $(USE_LASSEN_OEMHOOK) is true and $(BOARD_WITHOUT_RADIO) is not true.
 ifneq ($(BOARD_WITHOUT_RADIO),true)
-    PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril
     $(call soong_config_set,sitril,use_lassen_oemhook_with_radio,true)
 endif
 
@@ -248,9 +202,6 @@ else
 	TARGET_USES_VULKAN = true
 endif
 
-PRODUCT_SOONG_NAMESPACES += \
-	vendor/arm/mali/valhall
-
 $(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM))
 
 include device/google/gs-common/gpu/gpu.mk
@@ -283,8 +234,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.vulkan.deqp.level-2024-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \
-	frameworks/native/data/etc/android.software.opengles.deqp.level-2024-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml
+	frameworks/native/data/etc/android.software.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_PACKAGES += \
@@ -345,16 +296,12 @@ DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay
 # This device is shipped with 33 (Android T)
 PRODUCT_SHIPPING_API_LEVEL := 33
 
-# RKP VINTF
--include vendor/google_nos/host/android/hals/keymaster/aidl/strongbox/RemotelyProvisionedComponent-citadel.mk
-
 # Enforce the Product interface
 PRODUCT_PRODUCT_VNDK_VERSION := current
 PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true
 
 # Init files
 PRODUCT_COPY_FILES += \
-	$(LOCAL_KERNEL):kernel \
 	device/google/gs201/conf/init.gs201.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.usb.rc \
 	device/google/gs201/conf/ueventd.gs201.rc:$(TARGET_COPY_OUT_VENDOR)/etc/ueventd.rc
 
@@ -369,12 +316,6 @@ PRODUCT_COPY_FILES += \
 	device/google/gs201/storage/6.1/init.gs201.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.storage.rc
 endif
 
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_COPY_FILES += \
-	device/google/gs201/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc \
-	device/google/gs201/conf/init.check_ap_pd_auth.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.check_ap_pd_auth.sh
-endif
-
 # Recovery files
 PRODUCT_COPY_FILES += \
 	device/google/gs201/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.gs201.rc
@@ -405,14 +346,6 @@ PRODUCT_HOST_PACKAGES += \
 	mkdtimg
 
 # 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 += \
@@ -436,13 +369,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
 
 # RPMB TA
 PRODUCT_PACKAGES += \
@@ -491,13 +419,6 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.telephony.euicc.mep.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.hardware.telephony.euicc.mep.xml
 endif
 
-# default usb debug functions
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PROPERTY_OVERRIDES += \
-	persist.vendor.usb.usbradio.config=dm
-endif
-
-
 PRODUCT_COPY_FILES += \
 	device/google/gs201/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json
 
@@ -604,12 +525,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
         ConnectivityOverlay
 
-PRODUCT_PACKAGES_ENG += \
-	f2fs_io \
-	check_f2fs \
-	f2fs.fibmap \
-	dump.f2fs
-
 # Storage dump
 include device/google/gs-common/storage/storage.mk
 
@@ -635,9 +550,6 @@ ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS)))
 include device/google/gs-common/dauntless/gsc.mk
 endif
 
-PRODUCT_PACKAGES_ENG += \
-	WvInstallKeybox
-
 # Copy Camera HFD Setfiles
 #PRODUCT_COPY_FILES += \
 	device/google/gs201/firmware/camera/libhfd/default_configuration.hfd.cfg.json:$(TARGET_COPY_OUT_VENDOR)/firmware/default_configuration.hfd.cfg.json \
@@ -689,10 +601,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	debug.slsi_platform=1 \
 	debug.hwc.winupdate=1
 
-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 \
@@ -767,11 +675,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
 ####################################
@@ -842,21 +745,11 @@ $(call inherit-product, system/core/trusty/trusty-base.mk)
 # Trusty dump
 include device/google/gs-common/trusty/trusty.mk
 
-# Trusty unit test and code coverage tool
-PRODUCT_PACKAGES_ENG += \
-   trusty-ut-ctrl \
-   tipc-test \
-   trusty_stats_test \
-   trusty-coverage-controller \
-
 # Trusty Secure DPU Daemon
 PRODUCT_PACKAGES += \
 	securedpud.slider
 
 # Trusty Metrics Daemon
-PRODUCT_SOONG_NAMESPACES += \
-	vendor/google/trusty/common
-
 PRODUCT_PACKAGES += \
 	trusty_metricsd
 
@@ -870,15 +763,9 @@ 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
 
 #VNDK
 PRODUCT_PACKAGES += \
@@ -914,12 +801,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
 	Iwlan
 
-#Iwlan test app for eng builds
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES += \
-	IwlanTestApp
-endif
-
 PRODUCT_PACKAGES += \
 	whitelist \
 	libstagefright_hdcp \
@@ -933,14 +814,8 @@ 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
 
-PRODUCT_PACKAGES_ENG += \
-	preinstalled-packages-product-gs201-device-debug.xml
-
 PRODUCT_PACKAGES += ShannonRcs
 endif
 
@@ -960,12 +835,7 @@ USE_SE_HIDL := true
 # Using Early Send Device Info
 USE_EARLY_SEND_DEVICE_INFO := true
 
-#$(call inherit-product, vendor/google_devices/telephony/common/device-vendor.mk)
-#$(call inherit-product, vendor/google_devices/gs201/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)
-
 # modem logging binary/configs
 PRODUCT_PACKAGES += modem_logging_control
 
@@ -978,13 +848,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 += \
@@ -1001,10 +866,7 @@ endif
 
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
-#$(call inherit-product, hardware/google_devices/exynos5/exynos5.mk)
-#$(call inherit-product-if-exists, hardware/google_devices/gs201/gs201.mk)
-#$(call inherit-product-if-exists, vendor/google_devices/common/exynos-vendor.mk)
-#$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4375/device-bcm.mk)
+
 include device/google/gs-common/sensors/sensors.mk
 $(call soong_config_set,usf,target_soc,gs201)
 
@@ -1022,13 +884,6 @@ PRODUCT_COPY_FILES += \
 	device/google/$(TARGET_BOARD_PLATFORM)/radio/config/Pixel_stability.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/modem/Pixel_stability.cfg \
 	device/google/$(TARGET_BOARD_PLATFORM)/radio/config/Pixel_stability.nprf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/Pixel_stability.nprf \
 
-# Vibrator Diag
-PRODUCT_PACKAGES_ENG += \
-	diag-vibrator \
-	diag-vibrator-cs40l25a \
-	diag-vibrator-drv2624 \
-	$(NULL)
-
 PRODUCT_PACKAGES += \
 	android.hardware.health-service.gs201 \
 	android.hardware.health-service.gs201_recovery \
@@ -1038,9 +893,6 @@ PRODUCT_PACKAGES += \
 include device/google/gs-common/audio/hidl_gs201.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))
 
@@ -1065,22 +917,6 @@ endif
 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 \
-	mahal_test \
-	ma_aoc_tuning_test \
-	crus_sp_cal
-endif
-
 PRODUCT_PACKAGES += \
 	google.hardware.media.c2@1.0-service \
 	libgc2_store \
@@ -1091,7 +927,7 @@ PRODUCT_PACKAGES += \
 	libgc2_utils
 
 ## Start packet router
-include device/google/gs101/telephony/pktrouter.mk
+include device/google/gs-common/telephony/pktrouter.mk
 
 # Thermal HAL
 PRODUCT_PROPERTY_OVERRIDES += persist.vendor.enable.thermal.genl=true
@@ -1100,16 +936,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,janeiro)
-# Include the edgetpu targets defined the namespaces below into the final image.
-PRODUCT_SOONG_NAMESPACES += \
-	vendor/google_devices/gs201/proprietary/gchips/tpu/metrics \
-	vendor/google_devices/gs201/proprietary/gchips/tpu/tflite_delegate \
-	vendor/google_devices/gs201/proprietary/gchips/tpu/darwinn_logging_service \
-	vendor/google_devices/gs201/proprietary/gchips/tpu/nnapi_stable_aidl \
-	vendor/google_devices/gs201/proprietary/gchips/tpu/aidl \
-	vendor/google_devices/gs201/proprietary/gchips/tpu/hal \
-	vendor/google_devices/gs201/proprietary/gchips/tpu/tachyon/tachyon_apis \
-	vendor/google_devices/gs201/proprietary/gchips/tpu/tachyon/service
+
 # TPU firmware
 PRODUCT_PACKAGES += edgetpu-janeiro.fw
 
@@ -1163,8 +990,6 @@ USES_RADIOEXT_V1_5 = true
 # Wifi ext
 include hardware/google/pixel/wifi_ext/device.mk
 
-# Battery Stats Viewer
-PRODUCT_PACKAGES_ENG += BatteryStatsViewer
 include device/google/gs201/dumpstate/item.mk
 
 # Install product specific framework compatibility matrix
@@ -1172,21 +997,6 @@ include device/google/gs201/dumpstate/item.mk
 # It must be split into the FCM of each partition.
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs201/device_framework_matrix_product.xml
 
-# Preopt SystemUI
-ifneq ($(RELEASE_SYSTEMUI_USE_SPEED_PROFILE), true)
-PRODUCT_DEXPREOPT_SPEED_APPS += SystemUIGoogle  # For internal
-PRODUCT_DEXPREOPT_SPEED_APPS += SystemUI        # For AOSP
-endif
-
-# Set on-device compilation mode for SystemUI.
-ifeq ($(RELEASE_SYSTEMUI_USE_SPEED_PROFILE), true)
-PRODUCT_PROPERTY_OVERRIDES += \
-    dalvik.vm.systemuicompilerfilter=speed-profile
-else
-PRODUCT_PROPERTY_OVERRIDES += \
-    dalvik.vm.systemuicompilerfilter=speed
-endif
-
 # Keymint 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 \

device_framework_matrix_product.xml

@@ -78,7 +78,7 @@
     </hal>
     <hal format="aidl" optional="true">
       <name>com.google.hardware.pixel.display</name>
-        <version>13</version>
+        <version>13-15</version>
         <interface>
             <name>IDisplay</name>
             <instance>default</instance>

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

evolution.dependencies

@@ -1,6 +1,10 @@
 [
   {
-    "repository": "device_google_gs101",
-    "target_path": "device/google/gs101"
+    "repository": "device_google_gs-common",
+    "target_path": "device/google/gs-common"
+  },
+  {
+    "repository": "packages_apps_PixelParts",
+    "target_path": "packages/apps/PixelParts"
   }
 ]

evolution_common.mk

@@ -5,4 +5,4 @@
 #
 
 # PixelParts
-include packages/apps/PixelParts/device.mk
+#include packages/apps/PixelParts/device.mk

factory/factory_post_boot/Android.bp

@@ -1,25 +0,0 @@
-//
-// Copyright (C) 2022 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 {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-sh_binary {
-    name: "factory_post_boot",
-    src: "factory_post_boot.sh",
-    vendor: true,
-    sub_dir: "factory",
-}
-

factory/factory_post_boot/factory_post_boot.sh

@@ -1,4 +0,0 @@
-#!/vendor/bin/sh
-
-# Add adbd to nnapi vendor cgroup. (b/222226268)
-echo `pidof adbd` > /proc/vendor_sched/set_task_group_nnapi

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/gs201:device_google_gs201_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: [
-        "//device/google/gs201:device_google_gs201_license",
-    ],
-}
-
-runtime_resource_overlay {
-    name: "FactoryOverlayFrameworkRes",
-    product_specific: true,
-}

factory/framework/AndroidManifest.xml

@@ -1,24 +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.frameworkres.overlay.factory">
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="android"
-      android:isStatic="true"
-      android:priority="2"/>
-</manifest>

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/gs201:device_google_gs201_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: [
-        "//device/google/gs201:device_google_gs201_license",
-    ],
-}
-
-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,41 +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, Capacity, ELabel, Language, Barcode -->
-    <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="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/gs201:device_google_gs201_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: [
-        "//device/google/gs201:device_google_gs201_license",
-    ],
-}
-
-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,85 +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/gs201/aosp_common.mk)
-$(call inherit-product-if-exists, vendor/google_devices/gs201/factory/pixel/device-factory.mk)
-
-PRODUCT_PROPERTY_OVERRIDES += service.adb.root=1 \
-                              ro.vendor.factory=1
-
-# 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 += \
-    vendor.camera.debug.bypass_face_ssd_processor=1 \
-    vendor.camera.debug.csi_ebuf_enable=0 \
-    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_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.force_segmentation_node_on=0 \
-    vendor.camera.debug.enable_saliency=0 \
-    vendor.camera.debug.force_local_tone_mapping_on=0 \
-    vendor.camera.debug.local_tone_mapping_controller_v1.mode=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 DebugFS restrictions in factory builds
-PRODUCT_SET_DEBUGFS_RESTRICTIONS := false
-
-# Disable Bluetooth as default in factory build
-DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay-factory
-
-PRODUCT_COPY_FILES += \
-    device/google/gs201/conf/init.factory.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.factory.rc
-
-BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/factory_boost
-
-# Add factory-friendly changes
-PRODUCT_PACKAGES += \
-        FactoryOverlaySettings \
-        FactoryOverlayLauncher3 \
-        FactoryOverlayFrameworkRes \
-        factory_post_boot
-
-# To prevent rebooting due to crashing services
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-    init.svc_debug.no_fatal.zygote=true \
-    persist.device_config.configuration.disable_rescue_party=true
-
-# PixelLogger for RF testing
-PRODUCT_PACKAGES_ENG += \
-    PixelLogger \

fingerprint/fpc1540/fingerprint_config.mk

@@ -1,18 +0,0 @@
-# ----------------------------
-# Add feature flags below
-# ----------------------------
-FPC_CONFIG_BUILD_VERSION=33
-FPC_CONFIG_CAPACITIVE=1
-FPC_CONFIG_MAX_NR_TEMPLATES=5
-FPC_CONFIG_SENSE_TOUCH_CALIBRATION_PATH=/data/fpc/calibration_sense_touch.dat
-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_PRODUCT_DEFAULT=FPC_PRODUCT_TYPE1541_S
-
-#
-# File included from device/<manufacture>/<>/<device>.mk
-# Packages to include into the build

fingerprint/fpc1540/fingerprint_config_factory.mk

@@ -1,21 +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
-
-#
-# File included from device/<manufacture>/<>/<device>.mk
-# Packages to include into the build

fingerprint/fpc1540/fp_tool/Android.bp

@@ -1,27 +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_gs201_license"],
-}
-
-cc_binary {
-    srcs: [
-        "fp_test.cpp"
-    ],
-    local_include_dirs: ["."],
-
-    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/fpc1540.mk

@@ -1,8 +0,0 @@
-# Fingerprint
-include device/google/gs201/fingerprint/fpc1540/fingerprint_config.mk
-
-PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.1-service.fpc \
-
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml

fingerprint/fpc1540/fpc1540_factory.mk

@@ -1,10 +0,0 @@
-# Fingerprint
-include device/google/gs201/fingerprint/fpc1540/fingerprint_config_factory.mk
-
-PRODUCT_PACKAGES += \
-    fpc_tee_test\
-    SensorTestTool \
-
-PRODUCT_PACKAGES += \
-    com.fingerprints.extension.xml \
-    com.fingerprints.extension \

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

modem/userdebug.mk

@@ -1,3 +0,0 @@
-ifneq ($(BOARD_WITHOUT_RADIO),true)
-  PRODUCT_PACKAGES += vcd
-endif

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/frameworks/base/core/res/res/values/config.xml

@@ -241,12 +241,6 @@
         <item>"/system_ext/priv-app/SystemUI/SystemUI.apk"</item>
     </string-array>
 
-    <!-- Bytes that the PinnerService will pin for Home app -->
-    <integer name="config_pinnerHomePinBytes">6291456</integer>
-
-    <!-- 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. -->
@@ -315,4 +309,12 @@
 
     <!-- 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>
+
+    <!-- Whether to enable APDU sender optimization i.e. a logical channel is opened and
+         kept open for multiple APDU commands within one session.-->
+    <bool name="euicc_optimize_apdu_sender">true</bool>
+
+</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/gs201:device_google_gs201_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: [
-        "//device/google/gs201:device_google_gs201_license",
-    ],
-}
-
-cc_binary {
-  name: "pixelstats-vendor",
-  init_rc: ["pixelstats-vendor.gs201.rc"],
-  srcs: [
-    "service.cpp",
-  ],
-  shared_libs: [
-    "libbase",
-    "liblog",
-    "libutils",
-    "libpixelstats",
-  ],
-  proprietary: true,
-  static_libs: ["chre_client"],
-  header_libs: ["chre_api"],
-}

pixelstats/pixelstats-vendor.gs201.rc

@@ -1,11 +0,0 @@
-on property:sys.boot_completed=1
-	chown system system /sys/class/power_supply/maxfg_base/fg_learning_events
-	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,125 +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>
-
-#include <pixelstats/SysfsCollector.h>
-#include <pixelstats/UeventListener.h>
-
-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",
-    .MitigationDurationPath = "/sys/devices/virtual/pmic/mitigation/irq_dur_cnt",
-    .BrownoutReasonProp = "vendor.brownout_reason",
-    .BrownoutLogPath = "/data/vendor/mitigation/lastmeal.txt",
-    .SpeakerTemperaturePath = "/sys/devices/platform/audiometrics/speaker_temp",
-    .SpeakerExcursionPath = "/sys/devices/platform/audiometrics/speaker_excursion",
-    .SpeakerHeartBeatPath = "/sys/devices/platform/audiometrics/speaker_heartbeat",
-    .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)
-    },
-    .BlockStatsLength = BLOCK_STATS_LENGTH,
-    .AmsRatePath = "/sys/devices/platform/audiometrics/ams_rate_read_once",
-    .MitigationPath = "/sys/devices/virtual/pmic/mitigation",
-    .ThermalStatsPaths = {
-        "/sys/devices/platform/100a0000.BIG/trip_counter",
-        "/sys/devices/platform/100a0000.MID/trip_counter",
-        "/sys/devices/platform/100a0000.LITTLE/trip_counter",
-        "/sys/devices/platform/100b0000.G3D/trip_counter",
-        "/sys/devices/platform/100b0000.TPU/trip_counter",
-        "/sys/devices/platform/100b0000.AUR/trip_counter",
-    },
-    .CCARatePath = "/sys/devices/platform/audiometrics/cca_count_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"
-        }
-    },
-    .ResumeLatencyMetricsPath = "/sys/kernel/metrics/resume_latency/resume_latency_metrics",
-    .LongIRQMetricsPath = "/sys/kernel/metrics/irq/long_irq_metrics",
-    .StormIRQMetricsPath = "/sys/kernel/metrics/irq/storm_irq_metrics",
-    .IRQStatsResetPath = "/sys/kernel/metrics/irq/stats_reset",
-    .ModemPcieLinkStatsPath = "/sys/devices/platform/11920000.pcie/link_stats",
-    .WifiPcieLinkStatsPath = "/sys/devices/platform/14520000.pcie/link_stats",
-    .GMSRPath = {
-        "/sys/class/power_supply/maxfg/gmsr",
-        "/sys/class/power_supply/maxfg_base/gmsr",
-    },
-    .FGModelLoadingPath = {
-        "/sys/class/power_supply/maxfg/m5_model_state",
-        "/sys/class/power_supply/maxfg_base/m5_model_state"
-    },
-    .FGLogBufferPath = {
-        "/dev/logbuffer_maxfg_monitor",
-        "/dev/logbuffer_max77779fg_monitor",
-        "/dev/logbuffer_maxfg_base_monitor",
-        "/dev/logbuffer_maxfg_secondary_monitor"
-    },
-    .TotalCallCountPath = "/sys/devices/platform/audiometrics/call_count"
-};
-
-const struct UeventListener::UeventPaths ueventPaths = {
-        .AudioUevent = "/devices/virtual/amcs/amcs",
-        .TypeCPartnerUevent = "PRODUCT_TYPE=",
-        .FwUpdatePath = ""
-};
-
-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;
-}

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

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2022 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 gs201 debug devices, per user type.
-     Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml
--->
-<config>
-    <!-- Battery Stats Viewer -->
-    <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>
-
-    <!-- RCS (Rich Communication Services)
-    TODO(b/259401601): Check if this should be preinstalled for SYSTEM user -->
-    <install-in-user-type package="com.google.android.sample.rcsclient">
-        <install-in user-type="SYSTEM" />
-        <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>

sepolicy/tracking_denials/bug_map

@@ -4,7 +4,12 @@ dump_display sysfs file b/350831939
 dump_modem sscoredump_vendor_data_coredump_file dir b/361726277
 dump_modem sscoredump_vendor_data_logcat_file dir b/361726277
 dumpstate unlabeled file b/350832009
+hal_audio_default hal_audio_default binder b/395745737
+hal_bluetooth_synabtlinux device chr_file b/386303831
 hal_camera_default aconfig_storage_metadata_file dir b/383013727
+hal_contexthub_default hal_bluetooth_service service_manager b/396573096
+hal_drm_widevine system_userdir_file dir b/393956479
+hal_drm_widevine widevine_sys_vendor_prop file b/393956479
 hal_face_default traced_producer_socket sock_file b/305600808
 hal_power_default hal_power_default capability b/237492146
 hal_sensors_default property_socket sock_file b/373755350
@@ -12,15 +17,22 @@ hal_sensors_default sysfs file b/336451433
 incidentd debugfs_wakeup_sources file b/282626428
 incidentd incidentd anon_inode b/282626428
 init init capability b/379206608
+init-display-sh kmsg_device chr_file b/388949662
 insmod-sh insmod-sh key b/336451874
+insmod-sh kmsg_device chr_file b/388949536
+insmod-sh vendor_edgetpu_debugfs dir b/385858933
 kernel dm_device blk_file b/319403445
 kernel kernel capability b/336451113
 kernel tmpfs chr_file b/321731318
 pixelstats_vendor block_device dir b/369540701
+pixelstats_vendor chre_socket sock_file b/400298488
+platform_app bluetooth_lea_mode_prop file b/402595629
 platform_app vendor_fw_file dir b/377811773
 platform_app vendor_rild_prop file b/377811773
 priv_app audio_config_prop file b/379246129
+priv_app metadata_file dir b/383438008
 ramdump ramdump capability b/369475655
+ramdump_app default_prop file b/386148928
 rfsd vendor_cbd_prop file b/317734397
 shell sysfs_net file b/329380891
 ssr_detector_app default_prop file b/359428005
@@ -37,4 +49,5 @@ vendor_init default_prop file b/329381126
 vendor_init default_prop property_service b/315104803
 vendor_init default_prop property_service b/359427666
 vendor_init default_prop property_service b/359428317
+zygote aconfig_storage_metadata_file dir b/383949172
 zygote zygote capability b/379206941

sepolicy/whitechapel_pro/file_contexts

@@ -1,7 +1,6 @@
 # Binaries
 /vendor/bin/dmd                                                             u:object_r:dmd_exec:s0
 /vendor/bin/modem_logging_control                                           u:object_r:modem_logging_control_exec:s0
-/vendor/bin/sced                                                            u:object_r:sced_exec:s0
 /vendor/bin/vcd                                                             u:object_r:vcd_exec:s0
 /vendor/bin/chre                                                            u:object_r:chre_exec:s0
 /vendor/bin/cbd                                                             u:object_r:cbd_exec:s0
@@ -82,6 +81,7 @@
 /dev/janeiro                                                                u:object_r:edgetpu_device:s0
 /dev/bigocean                                                               u:object_r:video_device:s0
 /dev/goodix_fp                                                              u:object_r:fingerprint_device:s0
+/dev/fth_fd                                                                 u:object_r:fingerprint_device:s0
 /dev/ispolin_ranging                                                        u:object_r:rls_device:s0
 /dev/watchdog0                                                              u:object_r:watchdog_device:s0
 /dev/mali0                                                                  u:object_r:gpu_device:s0

sepolicy/whitechapel_pro/genfs_contexts

@@ -212,6 +212,10 @@ genfscon sysfs /devices/platform/google,battery/power_supply/battery
 genfscon sysfs /devices/platform/google,cpm                                     u:object_r:sysfs_batteryinfo:s0
 genfscon sysfs /devices/platform/google,charger                                 u:object_r:sysfs_batteryinfo:s0
 genfscon sysfs /devices/platform/10d60000.hsi2c                                 u:object_r:sysfs_batteryinfo:s0
+genfscon sysfs /class/power_supply/wireless/device/version                      u:object_r:sysfs_batteryinfo:s0
+genfscon sysfs /class/power_supply/wireless/device/status                       u:object_r:sysfs_batteryinfo:s0
+genfscon sysfs /class/power_supply/wireless/device/fw_rev                       u:object_r:sysfs_batteryinfo:s0
+
 genfscon sysfs /devices/pseudo_0/adapter0/host1/target1:0:0/1:0:0:0/block/sde   u:object_r:sysfs_devices_block:s0
 
 # P22 battery
@@ -275,6 +279,9 @@ genfscon sysfs /devices/platform/odm/odm:btbcm/wakeup
 genfscon sysfs /devices/platform/sound-aoc/wakeup                                                                           u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/1c2c0000.drmdsim/1c2c0000.drmdsim.0/wakeup                                                 u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/wakeup                                                 u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/odm/odm:fps_touch_handler/power/wakeup                                                     u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/odm/odm:fps_touch_handler/wakeup                                                           u:object_r:sysfs_wakeup:s0
+
 
 #SecureElement
 genfscon sysfs /devices/platform/181c0000.spi/spi_master/spi17/spi17.0/st33spi u:object_r:sysfs_st33spi:s0
@@ -353,3 +360,6 @@ genfscon sysfs /devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby
 
 # WLC
 genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-15/15-003c                  u:object_r:sysfs_wlc:s0
+
+# USB
+genfscon sysfs /devices/platform/11210000.usb/11210000.dwc3/udc/11210000.dwc3/state   u:object_r:sysfs_udc:s0

sepolicy/whitechapel_pro/hal_usb_impl.te

@@ -33,3 +33,4 @@ allow hal_usb_impl usb_device:dir r_dir_perms;
 # For monitoring usb sysfs attributes
 allow hal_usb_impl sysfs_wakeup:dir search;
 allow hal_usb_impl sysfs_wakeup:file r_file_perms;
+allow hal_usb_impl sysfs_udc:file r_file_perms;

sepolicy/whitechapel_pro/init-display-sh.te

@@ -8,3 +8,5 @@ allow init-display-sh vendor_toolbox_exec:file execute_no_trans;
 
 dontaudit init-display-sh proc_cmdline:file r_file_perms;
 
+# Allow modprobe to log to kmsg.
+allow init-display-sh kmsg_device:chr_file w_file_perms;

sepolicy/whitechapel_pro/modem_svc_sit.te

@@ -52,6 +52,4 @@ allow modem_svc_sit modem_img_file:file r_file_perms;
 allow modem_svc_sit modem_img_file:lnk_file r_file_perms;
 
 # Allow modem_svc_sit to access socket for UMI
-userdebug_or_eng(`
-  allow modem_svc_sit radio_vendor_data_file:sock_file { create unlink };
-')
+allow modem_svc_sit radio_vendor_data_file:sock_file { create unlink write };

sepolicy/whitechapel_pro/sced.te

@@ -1,23 +0,0 @@
-type sced, domain;
-type sced_exec, vendor_file_type, exec_type, file_type;
-
-userdebug_or_eng(`
-  init_daemon_domain(sced)
-  typeattribute sced vendor_executes_system_violators;
-
-  hwbinder_use(sced)
-  binder_call(sced, dmd)
-  binder_call(sced, vendor_telephony_silentlogging_app)
-
-  get_prop(sced, hwservicemanager_prop)
-  allow sced self:packet_socket create_socket_perms_no_ioctl;
-
-  allow sced self:capability net_raw;
-  allow sced shell_exec:file rx_file_perms;
-  allow sced tcpdump_exec:file rx_file_perms;
-  allow sced vendor_shell_exec:file x_file_perms;
-  allow sced vendor_slog_file:dir create_dir_perms;
-  allow sced vendor_slog_file:file create_file_perms;
-  allow sced hidl_base_hwservice:hwservice_manager add;
-  allow sced hal_vendor_oem_hwservice:hwservice_manager { add find };
-')

sepolicy/whitechapel_pro/service_contexts

@@ -1,6 +1,4 @@
 com.google.hardware.pixel.display.IDisplay/default         u:object_r:hal_pixel_display_service:s0
 hardware.qorvo.uwb.IUwbVendor/default                      u:object_r:hal_uwb_vendor_service:s0
 
-vendor.google.wireless_charger.IWirelessCharger/default                      u:object_r:hal_wireless_charger_service:s0
-
 rlsservice                                                 u:object_r:rls_service:s0

sepolicy/whitechapel_pro/vendor_telephony_silentlogging_app.te

@@ -10,7 +10,6 @@ allow vendor_telephony_silentlogging_app vendor_slog_file:file create_file_perms
 allow vendor_telephony_silentlogging_app app_api_service:service_manager find;
 allow vendor_telephony_silentlogging_app hal_vendor_oem_hwservice:hwservice_manager find;
 binder_call(vendor_telephony_silentlogging_app, dmd)
-binder_call(vendor_telephony_silentlogging_app, sced)
 
 userdebug_or_eng(`
 # Silent Logging

task_profiles.json

@@ -462,13 +462,13 @@
       ]
     },
     {
-      "Name": "ResetUclampGrp",
+      "Name": "SCHED_QOS_NONE",
       "Actions": [
         {
           "Name": "WriteFile",
           "Params":
           {
-            "FilePath": "/proc/vendor_sched/uclamp_fork_reset_set",
+            "FilePath": "/proc/vendor_sched/sched_qos/sched_qos_none",
             "Value": "<pid>",
             "LogFailures": "false"
           }
@@ -476,18 +476,73 @@
       ]
     },
     {
-      "Name": "NoResetUclampGrp",
+      "Name": "SCHED_QOS_POWER_EFFICIENCY",
       "Actions": [
         {
           "Name": "WriteFile",
           "Params":
           {
-            "FilePath": "/proc/vendor_sched/uclamp_fork_reset_clear",
+            "FilePath": "/proc/vendor_sched/sched_qos/sched_qos_power_efficiency",
             "Value": "<pid>",
             "LogFailures": "false"
           }
         }
       ]
+    },
+    {
+      "Name": "SCHED_QOS_SENSITIVE_EXTREME",
+      "Actions": [
+        {
+          "Name": "WriteFile",
+          "Params":
+          {
+            "FilePath": "/proc/vendor_sched/sched_qos/sched_qos_sensitive_extreme",
+            "Value": "<pid>",
+            "LogFailures": "false"
+          }
+        }
+      ]
+    },
+    {
+      "Name": "SCHED_QOS_SENSITIVE_HIGH",
+      "Actions": [
+        {
+          "Name": "WriteFile",
+          "Params":
+          {
+            "FilePath": "/proc/vendor_sched/sched_qos/sched_qos_sensitive_high",
+            "Value": "<pid>",
+            "LogFailures": "false"
+          }
+        }
+      ]
+    },
+    {
+      "Name": "SCHED_QOS_SENSITIVE_STANDARD",
+      "Actions": [
+        {
+          "Name": "WriteFile",
+          "Params":
+          {
+            "FilePath": "/proc/vendor_sched/sched_qos/sched_qos_sensitive_standard",
+            "Value": "<pid>",
+            "LogFailures": "false"
+          }
+        }
+      ]
+    },
+    {
+      "Name": "HighestCfsPrioScheduling",
+      "Actions": [
+        {
+          "Name": "SetSchedulerPolicy",
+          "Params":
+          {
+            "Policy": "SCHED_OTHER",
+            "Nice": "-20"
+          }
+        }
+      ]
     }
   ],
 
@@ -500,33 +555,9 @@
       "Name": "OtaProfiles",
       "Profiles": [ "OtaPerformance", "ServiceCapacityLow", "LowIoPriority", "TimerSlackHigh" ]
     },
-    {
-      "Name": "SCHED_QOS_SENSITIVE_EXTREME_SET",
-      "Profiles": [ "AdpfSet", "PreferIdleSet", "PreferFitSet", "BoostPrioSet", "PreemptWakeupSet" ]
-    },
-    {
-      "Name": "SCHED_QOS_SENSITIVE_EXTREME_CLEAR",
-      "Profiles": [ "AdpfClear", "PreferIdleClear", "PreferFitClear", "BoostPrioClear", "PreemptWakeupClear" ]
-    },
-    {
-      "Name": "SCHED_QOS_SENSITIVE_STANDARD_SET",
-      "Profiles": [ "AdpfSet", "PreferIdleSet", "PreferFitSet" ]
-    },
-    {
-      "Name": "SCHED_QOS_SENSITIVE_STANDARD_CLEAR",
-      "Profiles": [ "AdpfClear", "PreferIdleClear", "PreferFitClear" ]
-    },
-    {
-      "Name": "SCHED_QOS_POWER_EFFICIENCY_SET",
-      "Profiles": [ "AutoUclampMaxSet" ]
-    },
-    {
-      "Name": "SCHED_QOS_POWER_EFFICIENCY_CLEAR",
-      "Profiles": [ "AutoUclampMaxClear" ]
-    },
     {
       "Name": "InputPolicy",
-      "Profiles": [ "MaxPerformance", "SCHED_QOS_SENSITIVE_EXTREME_SET" ]
+      "Profiles": [ "MaxPerformance", "SCHED_QOS_SENSITIVE_EXTREME" ]
     }
   ]
 }

usb/usb/Android.bp

@@ -34,7 +34,6 @@ cc_binary {
     srcs: [
         "service.cpp",
         "Usb.cpp",
-        "UsbDataSessionMonitor.cpp",
     ],
     shared_libs: [
         "libbase",
@@ -60,18 +59,13 @@ cc_binary {
     ],
     static_libs: [
         "libpixelusb-aidl",
+        "libpixelusb-datasession",
         "libpixelstats",
         "libthermalutils",
-        "android.hardware.usb.flags-aconfig-c-lib",
+        "android.hardware.usb.flags-aconfig-cc-lib",
     ],
     export_shared_lib_headers: [
         "android.frameworks.stats-V2-ndk",
         "pixelatoms-cpp",
     ],
 }
-
-cc_aconfig_library {
-    name: "android.hardware.usb.flags-aconfig-c-lib",
-    vendor: true,
-    aconfig_declarations: "android.hardware.usb.flags-aconfig",
-}

usb/usb/Usb.cpp

@@ -101,11 +101,17 @@ constexpr char kUdcUeventRegex[] =
 constexpr char kUdcStatePath[] =
     "/sys/devices/platform/11210000.usb/11210000.dwc3/udc/11210000.dwc3/state";
 constexpr char kHost1UeventRegex[] =
-    "/devices/platform/11210000.usb/11210000.dwc3/xhci-hcd-exynos.[0-9].auto/usb2/2-0:1.0";
-constexpr char kHost1StatePath[] = "/sys/bus/usb/devices/usb2/2-0:1.0/usb2-port1/state";
+    "/devices/platform/11210000.usb/11210000.dwc3/xhci-hcd-exynos.[0-9].auto/usb1/1-0:1.0";
+constexpr char kHost1StatePath[] = "/sys/bus/usb/devices/usb1/1-0:1.0/usb1-port1/state";
 constexpr char kHost2UeventRegex[] =
-    "/devices/platform/11210000.usb/11210000.dwc3/xhci-hcd-exynos.[0-9].auto/usb3/3-0:1.0";
-constexpr char kHost2StatePath[] = "/sys/bus/usb/devices/usb3/3-0:1.0/usb3-port1/state";
+    "/devices/platform/11210000.usb/11210000.dwc3/xhci-hcd-exynos.[0-9].auto/usb2/2-0:1.0";
+constexpr char kHost2StatePath[] = "/sys/bus/usb/devices/usb2/2-0:1.0/usb2-port1/state";
+constexpr char kHubHost1UeventRegex[] =
+    "/devices/platform/11210000.usb/11210000.dwc3/xhci-hcd-exynos.[0-9].auto/usb1/1-1/1-1:1.0";
+constexpr char kHubHost1StatePath[] = "/sys/bus/usb/devices/usb1/1-1/1-1:1.0/1-1-port1/state";
+constexpr char kHubHost2UeventRegex[] =
+    "/devices/platform/11210000.usb/11210000.dwc3/xhci-hcd-exynos.[0-9].auto/usb1/1-1/1-1:1.0";
+constexpr char kHubHost2StatePath[] = "/sys/bus/usb/devices/usb1/1-1/1-1:1.0/1-1-port2/state";
 constexpr char kDataRolePath[] = "/sys/devices/platform/11210000.usb/new_data_role";
 
 constexpr int kSamplingIntervalSec = 5;
@@ -474,6 +480,12 @@ bool switchMode(const string &portName, const PortRole &in_role, struct Usb *usb
     return roleSwitch;
 }
 
+void updatePortStatus(android::hardware::usb::Usb *usb) {
+    std::vector<PortStatus> currentPortStatus;
+
+    queryVersionHelper(usb, &currentPortStatus);
+}
+
 static int getInternalHubUniqueId() {
     string internalHubDevnum;
     int devnum = 0, internalHubUniqueId = -1;
@@ -483,10 +495,9 @@ static int getInternalHubUniqueId() {
     return internalHubUniqueId;
 }
 
-static Status tuneInternalHub(const char *devname, void* client_data) {
+static Status tuneInternalHub(const char *devname, android::hardware::usb::Usb *usb) {
     uint16_t vendorId, productId;
     struct usb_device *device;
-    ::aidl::android::hardware::usb::Usb *usb;
     int value, index;
 
     device = usb_device_open(devname);
@@ -495,7 +506,6 @@ static Status tuneInternalHub(const char *devname, void* client_data) {
         return Status::ERROR;
     }
 
-    usb = (::aidl::android::hardware::usb::Usb *)client_data;
     value = usb->mUsbHubVendorCmdValue;
     index = usb->mUsbHubVendorCmdIndex;
 
@@ -518,20 +528,46 @@ static Status tuneInternalHub(const char *devname, void* client_data) {
 }
 
 static int usbDeviceRemoved(const char *devname, void* client_data) {
+    string pogoEnableHub;
+    ::aidl::android::hardware::usb::Usb *usb;
+
+    usb = (::aidl::android::hardware::usb::Usb *)client_data;
+
+    if (usb->mIntHubEnabled == true && ReadFileToString(kPogoEnableHub, &pogoEnableHub)
+        && Trim(pogoEnableHub) == "0") {
+        ALOGI("Internal hub disabled");
+        usb->mIntHubEnabled = false;
+        usb->mUsbDataSessionMonitor.reset(new UsbDataSessionMonitor(kUdcUeventRegex, kUdcStatePath,
+                                          kHost1UeventRegex, kHost1StatePath, kHost2UeventRegex,
+                                          kHost2StatePath, kDataRolePath,
+                                          std::bind(&updatePortStatus, usb)));
+    }
+
     return 0;
 }
 
 static int usbDeviceAdded(const char *devname, void* client_data) {
     string pogoEnableHub;
     int uniqueId = 0;
+    ::aidl::android::hardware::usb::Usb *usb;
+
+    usb = (::aidl::android::hardware::usb::Usb *)client_data;
 
     // Enable hub tuning when the pogo dock is connected.
     if (ReadFileToString(kPogoEnableHub, &pogoEnableHub) && Trim(pogoEnableHub) == "1") {
         // If enable_hub is set to 1, the internal hub is the first enumearted device on bus 1 and
         // port 1.
         uniqueId = usb_device_get_unique_id_from_name(devname);
-        if (uniqueId == getInternalHubUniqueId())
-            tuneInternalHub(devname, client_data);
+        if (uniqueId == getInternalHubUniqueId()) {
+            ALOGI("Internal hub enabled");
+            usb->mIntHubEnabled = true;
+            tuneInternalHub(devname, usb);
+            usb->mUsbDataSessionMonitor.reset(new UsbDataSessionMonitor(kUdcUeventRegex,
+                                              kUdcStatePath, kHubHost1UeventRegex,
+                                              kHubHost1StatePath, kHubHost2UeventRegex,
+                                              kHubHost2StatePath, kDataRolePath,
+                                              std::bind(&updatePortStatus, usb)));
+        }
     }
 
     return 0;
@@ -554,20 +590,14 @@ void *usbHostWork(void *param) {
     return NULL;
 }
 
-void updatePortStatus(android::hardware::usb::Usb *usb) {
-    std::vector<PortStatus> currentPortStatus;
-
-    queryVersionHelper(usb, &currentPortStatus);
-}
-
 Usb::Usb()
     : mLock(PTHREAD_MUTEX_INITIALIZER),
       mRoleSwitchLock(PTHREAD_MUTEX_INITIALIZER),
       mPartnerLock(PTHREAD_MUTEX_INITIALIZER),
       mPartnerUp(false),
-      mUsbDataSessionMonitor(kUdcUeventRegex, kUdcStatePath, kHost1UeventRegex, kHost1StatePath,
-                             kHost2UeventRegex, kHost2StatePath, kDataRolePath,
-                             std::bind(&updatePortStatus, this)),
+      mUsbDataSessionMonitor(new UsbDataSessionMonitor(kUdcUeventRegex, kUdcStatePath,
+                             kHost1UeventRegex, kHost1StatePath, kHost2UeventRegex,
+                             kHost2StatePath, kDataRolePath, std::bind(&updatePortStatus, this))),
       mOverheat(ZoneInfo(TemperatureType::USB_PORT, kThermalZoneForTrip,
                          ThrottlingSeverity::CRITICAL),
                 {ZoneInfo(TemperatureType::UNKNOWN, kThermalZoneForTempReadPrimary,
@@ -977,7 +1007,7 @@ void queryUsbDataSession(android::hardware::usb::Usb *usb,
                           std::vector<PortStatus> *currentPortStatus) {
     std::vector<ComplianceWarning> warnings;
 
-    usb->mUsbDataSessionMonitor.getComplianceWarnings(
+    usb->mUsbDataSessionMonitor->getComplianceWarnings(
         (*currentPortStatus)[0].currentDataRole, &warnings);
     (*currentPortStatus)[0].complianceWarnings.insert(
         (*currentPortStatus)[0].complianceWarnings.end(),

usb/usb/Usb.h

@@ -19,9 +19,9 @@
 #include <android-base/file.h>
 #include <aidl/android/hardware/usb/BnUsb.h>
 #include <aidl/android/hardware/usb/BnUsbCallback.h>
+#include <pixelusb/UsbDataSessionMonitor.h>
 #include <pixelusb/UsbOverheatEvent.h>
 #include <utils/Log.h>
-#include <UsbDataSessionMonitor.h>
 
 #define UEVENT_MSG_LEN 2048
 // The type-c stack waits for 4.5 - 5.5 secs before declaring a port non-pd.
@@ -39,6 +39,7 @@ using ::aidl::android::hardware::usb::IUsbCallback;
 using ::aidl::android::hardware::usb::PortRole;
 using ::android::base::ReadFileToString;
 using ::android::base::WriteStringToFile;
+using ::android::hardware::google::pixel::usb::UsbDataSessionMonitor;
 using ::android::hardware::google::pixel::usb::UsbOverheatEvent;
 using ::android::hardware::google::pixel::usb::ZoneInfo;
 using ::android::hardware::thermal::V2_0::TemperatureType;
@@ -91,7 +92,8 @@ struct Usb : public BnUsb {
     bool mPartnerUp;
 
     // Report usb data session event and data incompliance warnings
-    UsbDataSessionMonitor mUsbDataSessionMonitor;
+    std::unique_ptr<UsbDataSessionMonitor> mUsbDataSessionMonitor;
+    bool mIntHubEnabled;
     // Usb Overheat object for push suez event
     UsbOverheatEvent mOverheat;
     // Temperature when connected

usb/usb/UsbDataSessionMonitor.cpp

@@ -1,508 +0,0 @@
-/*
- * Copyright (C) 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "android.hardware.usb.aidl-service.UsbDataSessionMonitor"
-
-#include "UsbDataSessionMonitor.h"
-
-#include <aidl/android/frameworks/stats/IStats.h>
-#include <android-base/file.h>
-#include <android-base/logging.h>
-#include <android_hardware_usb_flags.h>
-#include <cutils/uevent.h>
-#include <pixelstats/StatsHelper.h>
-#include <pixelusb/CommonUtils.h>
-#include <sys/epoll.h>
-#include <sys/timerfd.h>
-#include <utils/Log.h>
-
-#include <regex>
-
-namespace usb_flags = android::hardware::usb::flags;
-
-using aidl::android::frameworks::stats::IStats;
-using android::base::ReadFileToString;
-using android::hardware::google::pixel::getStatsService;
-using android::hardware::google::pixel::reportUsbDataSessionEvent;
-using android::hardware::google::pixel::PixelAtoms::VendorUsbDataSessionEvent;
-using android::hardware::google::pixel::usb::addEpollFd;
-using android::hardware::google::pixel::usb::BuildVendorUsbDataSessionEvent;
-
-namespace aidl {
-namespace android {
-namespace hardware {
-namespace usb {
-
-#define UEVENT_MSG_LEN 2048
-#define USB_STATE_MAX_LEN 20
-#define DATA_ROLE_MAX_LEN 10
-#define WARNING_SURFACE_DELAY_SEC 5
-#define ENUM_FAIL_DEFAULT_COUNT_THRESHOLD 3
-#define DEVICE_FLAKY_CONNECTION_CONFIGURED_COUNT_THRESHOLD 5
-
-constexpr char kUdcConfigfsPath[] = "/config/usb_gadget/g1/UDC";
-constexpr char kNotAttachedState[] = "not attached\n";
-constexpr char kAttachedState[] = "attached\n";
-constexpr char kPoweredState[] = "powered\n";
-constexpr char kDefaultState[] = "default\n";
-constexpr char kAddressedState[] = "addressed\n";
-constexpr char kConfiguredState[] = "configured\n";
-constexpr char kSuspendedState[] = "suspended\n";
-const std::set<std::string> kValidStates = {kNotAttachedState, kAttachedState,  kPoweredState,
-                                            kDefaultState,     kAddressedState, kConfiguredState,
-                                            kSuspendedState};
-
-static int addEpollFile(const int &epollFd, const std::string &filePath, unique_fd &fileFd) {
-    struct epoll_event ev;
-
-    unique_fd fd(open(filePath.c_str(), O_RDONLY));
-
-    if (fd.get() == -1) {
-        ALOGI("Cannot open %s", filePath.c_str());
-        return -1;
-    }
-
-    ev.data.fd = fd.get();
-    ev.events = EPOLLPRI;
-
-    if (epoll_ctl(epollFd, EPOLL_CTL_ADD, fd.get(), &ev) != 0) {
-        ALOGE("epoll_ctl failed; errno=%d", errno);
-        return -1;
-    }
-
-    fileFd = std::move(fd);
-    ALOGI("epoll registered %s", filePath.c_str());
-    return 0;
-}
-
-static void removeEpollFile(const int &epollFd, const std::string &filePath, unique_fd &fileFd) {
-    epoll_ctl(epollFd, EPOLL_CTL_DEL, fileFd.get(), NULL);
-    fileFd.release();
-
-    ALOGI("epoll unregistered %s", filePath.c_str());
-}
-
-UsbDataSessionMonitor::UsbDataSessionMonitor(
-    const std::string &deviceUeventRegex, const std::string &deviceStatePath,
-    const std::string &host1UeventRegex, const std::string &host1StatePath,
-    const std::string &host2UeventRegex, const std::string &host2StatePath,
-    const std::string &dataRolePath, std::function<void()> updatePortStatusCb) {
-    struct epoll_event ev;
-    std::string udc;
-
-    unique_fd epollFd(epoll_create(8));
-    if (epollFd.get() == -1) {
-        ALOGE("epoll_create failed; errno=%d", errno);
-        abort();
-    }
-
-    unique_fd ueventFd(uevent_open_socket(64 * 1024, true));
-    if (ueventFd.get() == -1) {
-        ALOGE("uevent_open_socket failed");
-        abort();
-    }
-    fcntl(ueventFd, F_SETFL, O_NONBLOCK);
-
-    if (addEpollFd(epollFd, ueventFd))
-        abort();
-
-    unique_fd timerFd(timerfd_create(CLOCK_BOOTTIME, TFD_NONBLOCK));
-    if (timerFd.get() == -1) {
-        ALOGE("create timerFd failed");
-        abort();
-    }
-
-    if (addEpollFd(epollFd, timerFd))
-        abort();
-
-    if (addEpollFile(epollFd.get(), dataRolePath, mDataRoleFd) != 0) {
-        ALOGE("monitor data role failed");
-        abort();
-    }
-
-    /*
-     * The device state file could be absent depending on the current data role
-     * and driver architecture. It's ok for addEpollFile to fail here, the file
-     * will be monitored later when its presence is detected by uevent.
-     */
-    mDeviceState.filePath = deviceStatePath;
-    mDeviceState.ueventRegex = deviceUeventRegex;
-    addEpollFile(epollFd.get(), mDeviceState.filePath, mDeviceState.fd);
-
-    mHost1State.filePath = host1StatePath;
-    mHost1State.ueventRegex = host1UeventRegex;
-    addEpollFile(epollFd.get(), mHost1State.filePath, mHost1State.fd);
-
-    mHost2State.filePath = host2StatePath;
-    mHost2State.ueventRegex = host2UeventRegex;
-    addEpollFile(epollFd.get(), mHost2State.filePath, mHost2State.fd);
-
-    mEpollFd = std::move(epollFd);
-    mUeventFd = std::move(ueventFd);
-    mTimerFd = std::move(timerFd);
-    mUpdatePortStatusCb = updatePortStatusCb;
-
-    if (ReadFileToString(kUdcConfigfsPath, &udc) && !udc.empty())
-        mUdcBind = true;
-    else
-        mUdcBind = false;
-
-    if (pthread_create(&mMonitor, NULL, this->monitorThread, this)) {
-        ALOGE("pthread creation failed %d", errno);
-        abort();
-    }
-
-    ALOGI("feature flag enable_report_usb_data_compliance_warning: %d",
-          usb_flags::enable_report_usb_data_compliance_warning());
-}
-
-UsbDataSessionMonitor::~UsbDataSessionMonitor() {}
-
-void UsbDataSessionMonitor::reportUsbDataSessionMetrics() {
-    std::vector<VendorUsbDataSessionEvent> events;
-
-    if (mDataRole == PortDataRole::DEVICE) {
-        VendorUsbDataSessionEvent event;
-        BuildVendorUsbDataSessionEvent(false /* is_host */, boot_clock::now(), mDataSessionStart,
-                                       &mDeviceState.states, &mDeviceState.timestamps, &event);
-        events.push_back(event);
-    } else if (mDataRole == PortDataRole::HOST) {
-        bool empty = true;
-        for (auto e : {&mHost1State, &mHost2State}) {
-            /*
-             * Host port will at least get an not_attached event after enablement,
-             * skip upload if no additional state is added.
-             */
-            if (e->states.size() > 1) {
-                VendorUsbDataSessionEvent event;
-                BuildVendorUsbDataSessionEvent(true /* is_host */, boot_clock::now(),
-                                               mDataSessionStart, &e->states, &e->timestamps,
-                                               &event);
-                events.push_back(event);
-                empty = false;
-            }
-        }
-        // All host ports have no state update, upload an event to reflect it
-        if (empty) {
-            VendorUsbDataSessionEvent event;
-            BuildVendorUsbDataSessionEvent(true /* is_host */, boot_clock::now(), mDataSessionStart,
-                                           &mHost1State.states, &mHost1State.timestamps, &event);
-            events.push_back(event);
-        }
-    } else {
-        return;
-    }
-
-    const std::shared_ptr<IStats> stats_client = getStatsService();
-    if (!stats_client) {
-        ALOGE("Unable to get AIDL Stats service");
-        return;
-    }
-
-    for (auto &event : events) {
-        reportUsbDataSessionEvent(stats_client, event);
-    }
-}
-
-void UsbDataSessionMonitor::getComplianceWarnings(const PortDataRole &role,
-                                                  std::vector<ComplianceWarning> *warnings) {
-    if (!usb_flags::enable_report_usb_data_compliance_warning())
-        return;
-
-    if (role != mDataRole || role == PortDataRole::NONE)
-        return;
-
-    for (auto w : mWarningSet) {
-        warnings->push_back(w);
-    }
-}
-
-void UsbDataSessionMonitor::notifyComplianceWarning() {
-    if (!usb_flags::enable_report_usb_data_compliance_warning())
-        return;
-
-    if (mUpdatePortStatusCb)
-        mUpdatePortStatusCb();
-}
-
-void UsbDataSessionMonitor::evaluateComplianceWarning() {
-    std::set<ComplianceWarning> newWarningSet;
-    int elapsedTimeSec;
-
-    elapsedTimeSec =
-        std::chrono::duration_cast<std::chrono::seconds>(boot_clock::now() - mDataSessionStart)
-            .count();
-
-    if (elapsedTimeSec >= WARNING_SURFACE_DELAY_SEC) {
-        if (mDataRole == PortDataRole::DEVICE && mUdcBind) {
-            int configuredCount = std::count(mDeviceState.states.begin(),
-                                             mDeviceState.states.end(), kConfiguredState);
-            int defaultCount =
-                std::count(mDeviceState.states.begin(), mDeviceState.states.end(), kDefaultState);
-
-            if (configuredCount == 0 && defaultCount > ENUM_FAIL_DEFAULT_COUNT_THRESHOLD)
-                newWarningSet.insert(ComplianceWarning::ENUMERATION_FAIL);
-
-            if (configuredCount > DEVICE_FLAKY_CONNECTION_CONFIGURED_COUNT_THRESHOLD)
-                newWarningSet.insert(ComplianceWarning::FLAKY_CONNECTION);
-        } else if (mDataRole == PortDataRole::HOST) {
-            int host1StateCount = mHost1State.states.size();
-            int host1ConfiguredCount =
-                std::count(mHost1State.states.begin(), mHost1State.states.end(), kConfiguredState);
-            int host1DefaultCount =
-                std::count(mHost1State.states.begin(), mHost1State.states.end(), kDefaultState);
-            int host2StateCount = mHost2State.states.size();
-            int host2ConfiguredCount =
-                std::count(mHost2State.states.begin(), mHost2State.states.end(), kConfiguredState);
-            int host2DefaultCount =
-                std::count(mHost2State.states.begin(), mHost2State.states.end(), kDefaultState);
-
-            if (host1ConfiguredCount == 0 && host2ConfiguredCount == 0 &&
-                (host1DefaultCount > ENUM_FAIL_DEFAULT_COUNT_THRESHOLD ||
-                 host2DefaultCount > ENUM_FAIL_DEFAULT_COUNT_THRESHOLD))
-                newWarningSet.insert(ComplianceWarning::ENUMERATION_FAIL);
-
-            if (host1StateCount == 1 && mHost1State.states.front() == kNotAttachedState &&
-                host2StateCount == 1 && mHost2State.states.front() == kNotAttachedState)
-                newWarningSet.insert(ComplianceWarning::MISSING_DATA_LINES);
-        }
-    }
-
-    if (newWarningSet != mWarningSet) {
-        std::string newWarningString;
-
-        for (auto e : newWarningSet) {
-            newWarningString += toString(e) + " ";
-        }
-        ALOGI("Usb data compliance warning changed to: %s", newWarningString.c_str());
-
-        mWarningSet = newWarningSet;
-        notifyComplianceWarning();
-    }
-}
-
-void UsbDataSessionMonitor::clearDeviceStateEvents(struct usbDeviceState *deviceState) {
-    deviceState->states.clear();
-    deviceState->timestamps.clear();
-}
-
-void UsbDataSessionMonitor::handleDeviceStateEvent(struct usbDeviceState *deviceState) {
-    int n;
-    char state[USB_STATE_MAX_LEN] = {0};
-
-    lseek(deviceState->fd.get(), 0, SEEK_SET);
-    n = read(deviceState->fd.get(), &state, USB_STATE_MAX_LEN);
-
-    if (kValidStates.find(state) == kValidStates.end()) {
-        ALOGE("Invalid state %s", state);
-        return;
-    }
-
-    ALOGI("Update USB device state: %s", state);
-
-    deviceState->states.push_back(state);
-    deviceState->timestamps.push_back(boot_clock::now());
-    evaluateComplianceWarning();
-}
-
-void UsbDataSessionMonitor::setupNewSession() {
-    mWarningSet.clear();
-    mDataSessionStart = boot_clock::now();
-
-    if (mDataRole == PortDataRole::DEVICE) {
-        clearDeviceStateEvents(&mDeviceState);
-    } else if (mDataRole == PortDataRole::HOST) {
-        clearDeviceStateEvents(&mHost1State);
-        clearDeviceStateEvents(&mHost2State);
-    }
-
-    if (mDataRole != PortDataRole::NONE) {
-        struct itimerspec delay = itimerspec();
-        delay.it_value.tv_sec = WARNING_SURFACE_DELAY_SEC;
-        int ret = timerfd_settime(mTimerFd.get(), 0, &delay, NULL);
-        if (ret < 0)
-            ALOGE("timerfd_settime failed err:%d", errno);
-    }
-}
-
-void UsbDataSessionMonitor::handleDataRoleEvent() {
-    int n;
-    PortDataRole newDataRole;
-    char role[DATA_ROLE_MAX_LEN] = {0};
-
-    lseek(mDataRoleFd.get(), 0, SEEK_SET);
-    n = read(mDataRoleFd.get(), &role, DATA_ROLE_MAX_LEN);
-
-    ALOGI("Update USB data role %s", role);
-
-    if (!std::strcmp(role, "host")) {
-        newDataRole = PortDataRole::HOST;
-    } else if (!std::strcmp(role, "device")) {
-        newDataRole = PortDataRole::DEVICE;
-    } else {
-        newDataRole = PortDataRole::NONE;
-    }
-
-    if (newDataRole != mDataRole) {
-        // Upload metrics for the last data session that has ended
-        if (mDataRole == PortDataRole::HOST || (mDataRole == PortDataRole::DEVICE && mUdcBind)) {
-            reportUsbDataSessionMetrics();
-        }
-
-        mDataRole = newDataRole;
-        setupNewSession();
-    }
-}
-
-void UsbDataSessionMonitor::updateUdcBindStatus(const std::string &devname) {
-    std::string function;
-    bool newUdcBind;
-
-    /*
-     * /sys/class/udc/<udc>/function prints out name of currently running USB gadget driver
-     * Ref: https://www.kernel.org/doc/Documentation/ABI/stable/sysfs-class-udc
-     * Empty name string means the udc device is not bound and gadget is pulldown.
-     */
-    if (!ReadFileToString("/sys" + devname + "/function", &function))
-        return;
-
-    if (function == "")
-        newUdcBind = false;
-    else
-        newUdcBind = true;
-
-    if (newUdcBind == mUdcBind)
-        return;
-
-    if (mDataRole == PortDataRole::DEVICE) {
-        if (mUdcBind && !newUdcBind) {
-            /*
-             * Gadget soft pulldown: report metrics as the end of a data session and
-             * re-evaluate compliance warnings to clear existing warnings if any.
-             */
-            reportUsbDataSessionMetrics();
-            evaluateComplianceWarning();
-
-        } else if (!mUdcBind && newUdcBind) {
-            // Gadget soft pullup: reset and start accounting for a new data session.
-            setupNewSession();
-        }
-    }
-
-    ALOGI("Udc bind status changes from %b to %b", mUdcBind, newUdcBind);
-    mUdcBind = newUdcBind;
-}
-
-void UsbDataSessionMonitor::handleUevent() {
-    char msg[UEVENT_MSG_LEN + 2];
-    char *cp;
-    int n;
-
-    n = uevent_kernel_multicast_recv(mUeventFd.get(), msg, UEVENT_MSG_LEN);
-    if (n <= 0)
-        return;
-    if (n >= UEVENT_MSG_LEN)
-        return;
-
-    msg[n] = '\0';
-    msg[n + 1] = '\0';
-    cp = msg;
-
-    while (*cp) {
-        for (auto e : {&mHost1State, &mHost2State}) {
-            if (std::regex_search(cp, std::regex(e->ueventRegex))) {
-                if (!strncmp(cp, "bind@", strlen("bind@"))) {
-                    addEpollFile(mEpollFd.get(), e->filePath, e->fd);
-                } else if (!strncmp(cp, "unbind@", strlen("unbind@"))) {
-                    removeEpollFile(mEpollFd.get(), e->filePath, e->fd);
-                }
-            }
-        }
-
-        // TODO: support bind@ unbind@ to detect dynamically allocated udc device
-        if (std::regex_search(cp, std::regex(mDeviceState.ueventRegex))) {
-            if (!strncmp(cp, "change@", strlen("change@"))) {
-                char *devname = cp + strlen("change@");
-                /*
-                 * Udc device emits a KOBJ_CHANGE event on configfs driver bind and unbind.
-                 * TODO: upstream udc driver emits KOBJ_CHANGE event BEFORE unbind is actually
-                 * executed. Add a short delay to get the correct state while working on a fix
-                 * upstream.
-                 */
-                usleep(50000);
-                updateUdcBindStatus(devname);
-            }
-        }
-        /* advance to after the next \0 */
-        while (*cp++) {
-        }
-    }
-}
-
-void UsbDataSessionMonitor::handleTimerEvent() {
-    int byteRead;
-    uint64_t numExpiration;
-
-    byteRead = read(mTimerFd.get(), &numExpiration, sizeof(numExpiration));
-
-    if (byteRead != sizeof(numExpiration)) {
-        ALOGE("incorrect read size");
-    }
-
-    if (numExpiration != 1) {
-        ALOGE("incorrect expiration count");
-    }
-
-    evaluateComplianceWarning();
-}
-
-void *UsbDataSessionMonitor::monitorThread(void *param) {
-    UsbDataSessionMonitor *monitor = (UsbDataSessionMonitor *)param;
-    struct epoll_event events[64];
-    int nevents = 0;
-
-    while (true) {
-        nevents = epoll_wait(monitor->mEpollFd.get(), events, 64, -1);
-        if (nevents == -1) {
-            if (errno == EINTR)
-                continue;
-            ALOGE("usb epoll_wait failed; errno=%d", errno);
-            break;
-        }
-
-        for (int n = 0; n < nevents; ++n) {
-            if (events[n].data.fd == monitor->mUeventFd.get()) {
-                monitor->handleUevent();
-            } else if (events[n].data.fd == monitor->mTimerFd.get()) {
-                monitor->handleTimerEvent();
-            } else if (events[n].data.fd == monitor->mDataRoleFd.get()) {
-                monitor->handleDataRoleEvent();
-            } else if (events[n].data.fd == monitor->mDeviceState.fd.get()) {
-                monitor->handleDeviceStateEvent(&monitor->mDeviceState);
-            } else if (events[n].data.fd == monitor->mHost1State.fd.get()) {
-                monitor->handleDeviceStateEvent(&monitor->mHost1State);
-            } else if (events[n].data.fd == monitor->mHost2State.fd.get()) {
-                monitor->handleDeviceStateEvent(&monitor->mHost2State);
-            }
-        }
-    }
-    return NULL;
-}
-
-}  // namespace usb
-}  // namespace hardware
-}  // namespace android
-}  // namespace aidl

usb/usb/UsbDataSessionMonitor.h

@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <aidl/android/hardware/usb/ComplianceWarning.h>
-#include <aidl/android/hardware/usb/PortDataRole.h>
-#include <android-base/chrono_utils.h>
-#include <android-base/unique_fd.h>
-
-#include <set>
-#include <string>
-#include <vector>
-
-namespace aidl {
-namespace android {
-namespace hardware {
-namespace usb {
-
-using ::aidl::android::hardware::usb::ComplianceWarning;
-using ::aidl::android::hardware::usb::PortDataRole;
-using ::android::base::boot_clock;
-using ::android::base::unique_fd;
-
-/*
- * UsbDataSessionMonitor monitors the usb device state sysfs of 3 different usb devices
- * including device mode (udc), host mode high-speed port and host mode super-speed port. It
- * reports Suez metrics for each data session and also provides API to query the compliance
- * warnings detected in the current usb data session.
- */
-class UsbDataSessionMonitor {
-  public:
-    /*
-     * The host mode high-speed port and super-speed port can be assigned to either host1 or
-     * host2 without affecting functionality.
-     *
-     * UeventRegex: name regex of the device that's being monitored. The regex is matched against
-     *              uevent to detect dynamic creation/deletion/change of the device.
-     * StatePath: usb device state sysfs path of the device, monitored by epoll.
-     * dataRolePath: path to the usb data role sysfs, monitored by epoll.
-     * updatePortStatusCb: the callback is invoked when the compliance warings changes.
-     */
-    UsbDataSessionMonitor(const std::string &deviceUeventRegex, const std::string &deviceStatePath,
-                          const std::string &host1UeventRegex, const std::string &host1StatePath,
-                          const std::string &host2UeventRegex, const std::string &host2StatePath,
-                          const std::string &dataRolePath,
-                          std::function<void()> updatePortStatusCb);
-    ~UsbDataSessionMonitor();
-    // Returns the compliance warnings detected in the current data session.
-    void getComplianceWarnings(const PortDataRole &role, std::vector<ComplianceWarning> *warnings);
-
-  private:
-    struct usbDeviceState {
-        unique_fd fd;
-        std::string filePath;
-        std::string ueventRegex;
-        // Usb device states reported by state sysfs
-        std::vector<std::string> states;
-        // Timestamps of when the usb device states were captured
-        std::vector<boot_clock::time_point> timestamps;
-    };
-
-    static void *monitorThread(void *param);
-    void handleUevent();
-    void handleTimerEvent();
-    void handleDataRoleEvent();
-    void handleDeviceStateEvent(struct usbDeviceState *deviceState);
-    void clearDeviceStateEvents(struct usbDeviceState *deviceState);
-    void setupNewSession();
-    void reportUsbDataSessionMetrics();
-    void evaluateComplianceWarning();
-    void notifyComplianceWarning();
-    void updateUdcBindStatus(const std::string &devname);
-
-    pthread_t mMonitor;
-    unique_fd mEpollFd;
-    unique_fd mUeventFd;
-    unique_fd mTimerFd;
-    unique_fd mDataRoleFd;
-    struct usbDeviceState mDeviceState;
-    struct usbDeviceState mHost1State;
-    struct usbDeviceState mHost2State;
-    std::set<ComplianceWarning> mWarningSet;
-    // Callback function to notify the caller when there's a change in compliance warnings.
-    std::function<void()> mUpdatePortStatusCb;
-    /*
-     * Cache relevant info for a USB data session when one starts, including
-     * the data role and the time when the session starts.
-     */
-    PortDataRole mDataRole;
-    boot_clock::time_point mDataSessionStart;
-    /*
-     * In gadget mode: this indicates whether the udc device is bound to the configfs driver, which
-     * is done by userspace writing the udc device name to /config/usb_gadget/g1/UDC. When unbound,
-     * the gadget is in soft pulldown state and is expected not to enumerate. During gadget
-     * function switch, the udc device usually go through unbind and bind.
-     */
-    bool mUdcBind;
-};
-
-}  // namespace usb
-}  // namespace hardware
-}  // namespace android
-}  // namespace aidl