Merge Android 12L

Bug: 222710654
Merged-In: I947ab15dae07501ee61edbd94cb937c2299f865b
Change-Id: I56878913a9985115efdac74dba665228cc244ee3

BoardConfig-common.mk

@@ -19,11 +19,6 @@ include build/make/target/board/BoardConfigPixelCommon.mk
 # Should be uncommented after fixing vndk-sp violation is fixed.
 PRODUCT_FULL_TREBLE_OVERRIDE := true
 
-# This prop, when set to 1, will prevent OTA tooling from generating a VABC OTA,
-# even if device actually supports it.
-# Remove this once P21 decides to use VABC OTA
-BOARD_DONT_USE_VABC_OTA := true
-
 # HACK : To fix up after bring up multimedia devices.
 TARGET_SOC := gs101
 
@@ -50,17 +45,18 @@ 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 += stack_depot_disable=off page_pinner=on
+BOARD_KERNEL_CMDLINE += swiotlb=noforce
 BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs
 
 TARGET_NO_BOOTLOADER := true
 TARGET_NO_RADIOIMAGE := true
-ifeq (,$(TARGET_PREBUILT_KERNEL))
-TARGET_NO_KERNEL := true
 ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
-BOARD_PREBUILT_BOOTIMAGE := $(TARGET_KERNEL_DIR)/boot.img
+BOARD_PREBUILT_BOOTIMAGE := $(wildcard $(TARGET_KERNEL_DIR)/boot.img)
 else
-BOARD_PREBUILT_BOOTIMAGE := $(TARGET_KERNEL_DIR)/boot-user.img
+BOARD_PREBUILT_BOOTIMAGE := $(wildcard $(TARGET_KERNEL_DIR)/boot-user.img)
 endif
+ifneq (,$(BOARD_PREBUILT_BOOTIMAGE))
+TARGET_NO_KERNEL := true
 else
 TARGET_NO_KERNEL := false
 endif
@@ -68,7 +64,17 @@ BOARD_USES_GENERIC_KERNEL_IMAGE := true
 BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT := true
 BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT := true
 TARGET_RECOVERY_WIPE := device/google/gs101/conf/recovery.wipe
-TARGET_RECOVERY_FSTAB := device/google/gs101/conf/fstab.gs101
+
+# This is the fstab file that will be included in the recovery image.  Note that
+# recovery doesn't care about the encryption settings, so it doesn't matter
+# whether we use the normal or the fips fstab here.
+#
+# Since this is a generated file, it's necessary to use intermediates-dir-for in
+# order to refer to it correctly.  And since intermediates-dir-for isn't defined
+# yet when this file is included, it's necessary to use a deferred variable
+# assignment ( = ) rather than an immediate variable assignment ( := ).
+TARGET_RECOVERY_FSTAB = $(call intermediates-dir-for,ETC,fstab.gs101)/fstab.gs101
+
 TARGET_RECOVERY_PIXEL_FORMAT := ABGR_8888
 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165
 TARGET_RECOVERY_UI_LIB := \
@@ -199,6 +205,8 @@ ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
 $(call soong_config_set,aoc_audio_func,aosp_build,true)
 endif
 
+$(call soong_config_set,haptics,actuator_model,$(ACTUATOR_MODEL))
+
 # Primary AudioHAL Configuration
 #BOARD_USE_COMMON_AUDIOHAL := true
 #BOARD_USE_CALLIOPE_AUDIOHAL := false
@@ -301,8 +309,6 @@ ENABLE_VENDOR_RIL_SERVICE := true
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := \
 	build/make/target/board/mainline_arm64/bluetooth
 
-TARGET_BOARD_KERNEL_HEADERS := $(TARGET_KERNEL_DIR)/kernel-headers
-
 #VNDK
 BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
 BOARD_VNDK_VERSION := current

conf/Android.bp

@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// By default this device uses hardware-wrapped keys for storage encryption,
+// which is intended to offer increased security over the traditional method
+// (software keys).  However, hardware-wrapped keys aren't compatible with
+// FIPS-140 certification of the encryption hardware, and hence we have to
+// disable the use of them in FIPS mode.  This requires having two fstab files:
+// one for the default mode, and one for FIPS mode selectable via
+// androidboot.fstab_suffix on the kernel command line.  These fstabs should be
+// identical with the exception of the encryption settings, so to keep them in
+// sync the rules below generate them from a template file.
+
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "device_google_gs101_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["device_google_gs101_license"],
+}
+
+genrule {
+    name: "gen_fstab.gs101",
+    srcs: ["fstab.gs101.in"],
+    out: ["fstab.gs101"],
+    cmd: "sed -e s/@fileencryption@/::inlinecrypt_optimized+wrappedkey_v0/" +
+        " -e s/@metadata_encryption@/:wrappedkey_v0/ $(in) > $(out)",
+}
+
+genrule {
+    name: "gen_fstab.gs101-fips",
+    srcs: ["fstab.gs101.in"],
+    out: ["fstab.gs101-fips"],
+    cmd: "sed -e s/@fileencryption@/aes-256-xts/" +
+        " -e s/@metadata_encryption@/aes-256-xts/ $(in) > $(out)",
+}
+
+prebuilt_etc {
+    name: "fstab.gs101",
+    src: ":gen_fstab.gs101",
+    vendor: true,
+    vendor_ramdisk_available: true,
+}
+
+prebuilt_etc {
+    name: "fstab.gs101-fips",
+    src: ":gen_fstab.gs101-fips",
+    vendor: true,
+    vendor_ramdisk_available: true,
+}

conf/fstab.gs101.in

@@ -5,9 +5,9 @@
 #
 #<src>                                                   <mnt_point>                 <type>  <mnt_flags and options>  <fs_mgr_flags>
 system                                                   /system                     ext4    ro,barrier=1             wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
-system_ext                                               /system_ext                 ext4    ro,barrier=1             wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
+system_ext                                               /system_ext                 ext4    ro,barrier=1             wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
-product                                                  /product                    ext4    ro,barrier=1             wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
+product                                                  /product                    ext4    ro,barrier=1             wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
-vendor                                                   /vendor                     ext4    ro,barrier=1             wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount
+vendor                                                   /vendor                     ext4    ro,barrier=1             wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128
 vendor_dlkm                                              /vendor_dlkm                ext4    ro,barrier=1             wait,slotselect,avb=vbmeta,logical,first_stage_mount
 /dev/block/platform/14700000.ufs/by-name/boot            /boot                       emmc    defaults                 slotselect,avb=boot,first_stage_mount
 /dev/block/platform/14700000.ufs/by-name/efs             /mnt/vendor/efs             ext4    defaults,noatime,rw      wait,check,formattable
@@ -17,7 +17,6 @@ vendor_dlkm                                              /vendor_dlkm
 /dev/block/platform/14700000.ufs/by-name/misc            /misc                       emmc    defaults                 wait
 /dev/block/platform/14700000.ufs/by-name/metadata        /metadata                   ext4    noatime,nosuid,nodev,data=journal,commit=1    wait,check,formattable,first_stage_mount,metadata_csum
 /dev/block/platform/14700000.ufs/by-name/pvmfw           /pvmfw                      emmc    defaults                 wait,slotselect,avb=pvmfw,first_stage_mount
-/dev/block/platform/14700000.ufs/by-name/userdata        /data                       f2fs    noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,inlinecrypt,compress_extension=apk,compress_extension=apex,compress_extension=so,atgc,checkpoint_merge    latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fileencryption=::inlinecrypt_optimized+wrappedkey_v0,metadata_encryption=:wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption,fscompress,readahead_size_kb=128
+/dev/block/platform/14700000.ufs/by-name/userdata        /data                       f2fs    noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,inlinecrypt,compress_extension=apk,compress_extension=apex,compress_extension=so,atgc,checkpoint_merge    latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fileencryption=@fileencryption@,metadata_encryption=@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption,fscompress,readahead_size_kb=128
 /dev/block/platform/14700000.ufs/by-name/vbmeta          /vbmeta                     emmc    defaults                 slotselect,first_stage_mount
-/dev/block/zram0                                         none                        swap    defaults                 zramsize=3221225472,max_comp_streams=8,zram_backingdev_size=512M
 /devices/platform/11110000.usb*                          auto                        vfat    defaults                 voldmanaged=usb:auto

conf/init.gs101.rc

@@ -82,10 +82,6 @@ on init
     # Property used by NFC for sku specific configurations
     setprop ro.boot.product.hardware.sku ${ro.boot.hardware.sku}
 
-    # NFC streset tool name
-    setprop persist.vendor.nfc.streset libstreset21
-    setprop persist.vendor.se.streset libstreset21
-
     # Support legacy paths
     symlink /data/app /factory
 
@@ -121,11 +117,11 @@ on init
     mkdir /dev/socket/pdx/system/vr/sensors 0775 system system
 
     # Boot time 183626384
-    write /sys/kernel/vendor_sched/ta_uclamp_min 308
+    write /sys/kernel/vendor_sched/ta_uclamp_min 1024
     write /sys/kernel/vendor_sched/ta_prefer_idle 1
-    write /sys/kernel/vendor_sched/fg_uclamp_min 308
+    write /sys/kernel/vendor_sched/fg_uclamp_min 1024
     write /sys/kernel/vendor_sched/fg_prefer_idle 1
-    write /sys/kernel/vendor_sched/sys_uclamp_min 308
+    write /sys/kernel/vendor_sched/sys_uclamp_min 1024
     write /sys/kernel/vendor_sched/sys_prefer_idle 1
 
     # governor setting
@@ -182,6 +178,9 @@ on init
     chown system system /dev/logbuffer_maxfg
     chown system system /dev/logbuffer_maxfg_base
     chown system system /dev/logbuffer_maxfg_flip
+    chown system system /dev/logbuffer_maxfg_monitor
+    chown system system /dev/logbuffer_maxfg_base_monitor
+    chown system system /dev/logbuffer_maxfg_flip_monitor
     chown system system /dev/logbuffer_maxq
     chown system system /dev/logbuffer_google,cpm
     chown system system /dev/logbuffer_rtx
@@ -241,6 +240,9 @@ on init
     chown system system /sys/devices/platform/google,battery/power_supply/battery/bd_trickle_reset_sec
     chown system system /sys/devices/platform/google,battery/power_supply/battery/bd_clear
     chown system system /sys/devices/platform/google,battery/power_supply/battery/health_safety_margin
+    chown system system /sys/devices/platform/google,battery/power_supply/battery/aacr_state
+    chown system system /sys/devices/platform/google,battery/power_supply/battery/aacr_cycle_max
+    chown system system /sys/devices/platform/google,battery/power_supply/battery/aacr_cycle_grace
     chown system system /sys/devices/platform/google,charger/bd_drainto_soc
     chown system system /sys/devices/platform/google,charger/bd_recharge_soc
     chown system system /sys/devices/platform/google,charger/bd_recharge_voltage
@@ -281,10 +283,10 @@ on init
     write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu1_memlat@17000010/mem_latency/ratio_ceil 400
     write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu2_memlat@17000010/mem_latency/ratio_ceil 400
     write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu3_memlat@17000010/mem_latency/ratio_ceil 400
-    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu4_memlat@17000010/mem_latency/ratio_ceil 400
+    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu4_memlat@17000010/mem_latency/ratio_ceil 2700
-    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu5_memlat@17000010/mem_latency/ratio_ceil 400
+    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu5_memlat@17000010/mem_latency/ratio_ceil 2700
-    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu6_memlat@17000010/mem_latency/ratio_ceil 800
+    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu6_memlat@17000010/mem_latency/ratio_ceil 3200
-    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu7_memlat@17000010/mem_latency/ratio_ceil 800
+    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu7_memlat@17000010/mem_latency/ratio_ceil 3200
 
 # For GKI kernel, no device specific modules
 on init
@@ -310,7 +312,7 @@ on late-fs
     class_start animation
 
     # Mount RW partitions which need run fsck
-    mount_all /vendor/etc/fstab.gs101 --late
+    mount_all --late
 
 on post-fs-data
     # Log data folder
@@ -504,7 +506,7 @@ on property:persist.vendor.radio.no_modem_board=1
     setprop ro.radio.noril yes
 
 on fs
-    mount_all /vendor/etc/fstab.gs101 --early
+    mount_all --early
     restorecon_recursive /mnt/vendor/efs
     chown radio system /mnt/vendor/efs
     restorecon_recursive /mnt/vendor/efs_backup
@@ -540,6 +542,8 @@ on fs
     chown system system /sys/class/backlight/panel0-backlight/hbm_mode
     chown system system /sys/class/backlight/panel0-backlight/local_hbm_mode
     chown system system /sys/devices/platform/exynos-drm/primary-panel/gamma
+    chown system system /sys/devices/platform/exynos-drm/primary-panel/min_vrefresh
+    chown system system /sys/devices/platform/exynos-drm/primary-panel/idle_delay_ms
     chown system system /sys/module/drm/parameters/vblankoffdelay
     chown system system /sys/class/dqe/atc/ambient_light
     chown system system /sys/class/dqe/atc/st
@@ -684,6 +688,8 @@ on property:sys.boot_completed=1
     chown system system /dev/sys/fs/by-name/userdata/compr_written_block
     chown system system /dev/sys/fs/by-name/userdata/compr_saved_block
     chown system system /dev/sys/fs/by-name/userdata/compr_new_inode
+    chown system system /dev/sys/fs/by-name/userdata/gc_segment_mode
+    chown system system /dev/sys/fs/by-name/userdata/gc_reclaimed_segments
 
     # Block layer tuning: discard chunk size up to 128MB
     # Otherwise, contiguous discards can be merged
@@ -712,12 +718,18 @@ on property:sys.boot_completed=1
     # Setup final cpu.uclamp
     write /sys/kernel/vendor_sched/ta_uclamp_min 1
     write /sys/kernel/vendor_sched/fg_uclamp_min 0
-    write /sys/kernel/vendor_sched/bg_uclamp_max 615
     write /sys/kernel/vendor_sched/sys_prefer_idle 0
     # cfs_rq clamp is using tg->uclamp setting
     # align it with the vendor_group setting
-    write /dev/cpuctl/background/cpu.uclamp.max 60
+    write /sys/kernel/vendor_sched/bg_uclamp_max 512
-    write /sys/kernel/vendor_sched/bg_group_throttle 615
+    write /dev/cpuctl/background/cpu.uclamp.max 50
+    write /sys/kernel/vendor_sched/bg_group_throttle 512
+    write /sys/kernel/vendor_sched/sysbg_uclamp_max 512
+    write /dev/cpuctl/system-background/cpu.uclamp.max 50
+    write /sys/kernel/vendor_sched/sysbg_group_throttle 512
+    write /sys/kernel/vendor_sched/dex2oat_uclamp_max 615
+    write /dev/cpuctl/dex2oat/cpu.uclamp.max 60
+    write /sys/kernel/vendor_sched/dex2oat_group_throttle 615
 
     # Setup groups for SF (RT used for SF RE, SF used for SF main)
     write /sys/kernel/vendor_sched/rt_uclamp_min 125
@@ -725,15 +737,16 @@ on property:sys.boot_completed=1
     write /sys/kernel/vendor_sched/sf_uclamp_min 30
     write /sys/kernel/vendor_sched/sf_prefer_idle 1
 
-    # Setup cpu.shares to throttle background group at 5%
+    # 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/system-background/cpu.shares 20480
     write /dev/cpuctl/top-app/cpu.shares 20480
 
     # gvotables for dumpstate
@@ -772,6 +785,10 @@ on  property:persist.sys.test_harness=1 && property:persist.vendor.testing_batte
     setprop persist.vendor.charge.start.level 0
     setprop vendor.battery.defender.disable 1
 
+# ACA (Adaptice Charge Always On) persist properties
+on property:persist.vendor.adaptive.charge.soc=*
+    write /sys/class/power_supply/battery/charge_limit ${persist.vendor.adaptive.charge.soc}
+
 service insmod_sh_common /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.gs101.cfg
     class main
     user root
@@ -850,9 +867,13 @@ on property:vendor.thermal.link_ready=1
     write /dev/thermal/tz-by-name/soft_ocp_gpu/policy user_space
     write /dev/thermal/tz-by-name/soc/policy user_space
     write /dev/thermal/tz-by-name/batoilo/policy user_space
+    write /sys/devices/virtual/pmic/mitigation/triggered_lvl/smpl_lvl 3100
     write /sys/devices/virtual/pmic/mitigation/triggered_lvl/soft_ocp_cpu2_lvl 9000
     write /sys/devices/virtual/pmic/mitigation/triggered_lvl/soft_ocp_gpu_lvl 9000
     write /sys/devices/virtual/pmic/mitigation/triggered_lvl/soft_ocp_tpu_lvl 8500
+    write /sys/devices/virtual/pmic/mitigation/clock_div/tpu_clk_div 0x201
+    write /sys/devices/virtual/pmic/mitigation/clock_div/gpu_clk_div 0x801
+    write /sys/devices/virtual/pmic/mitigation/clock_div/cpu2_clk_div 0x801
     chown system system /dev/thermal/tz-by-name/soc/mode
     chown system system /dev/thermal/tz-by-name/batoilo/trip_point_0_temp
     chown system system /dev/thermal/tz-by-name/batoilo/trip_point_0_hyst

conf/init.gs101.usb.rc

@@ -68,6 +68,9 @@ on early-boot
     # etr_miu function
     mkdir /config/usb_gadget/g1/functions/etr_miu.gs11
 
+    # acm function for uwb
+    mkdir /config/usb_gadget/g1/functions/acm.uwb0
+
     setprop vendor.usb.functions.ready 1
 
 on boot
@@ -120,3 +123,6 @@ on property:sys.usb.config=charger && property:sys.usb.configfs=1
 
 on property:vendor.usb.contaminantdisable=true
     exec /vendor/bin/hw/disable_contaminant_detection.sh
+
+on property:ro.bootmode=usbuwb
+    setprop persist.vendor.usb.usbradio.config uwb_acm

conf/ueventd.gs101.rc

@@ -209,3 +209,7 @@
 
 # Direct Charging
 /dev/logbuffer_pca9468_tcpm            0600   system     system
+
+# Raw HID devices
+/dev/hidraw*                           0660   system     system
+

default-permissions.xml

@@ -57,6 +57,7 @@
     <exception package="com.google.android.apps.cbrsnetworkmonitor">
         <!-- Location access to create CBRS geofences-->
         <permission name="android.permission.ACCESS_FINE_LOCATION" fixed="true"/>
+        <permission name="android.permission.ACCESS_COARSE_LOCATION" fixed="true"/>
         <permission name="android.permission.ACCESS_BACKGROUND_LOCATION" fixed="true"/>
     </exception>
 

device-common.mk

@@ -25,7 +25,7 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml
 
 # Factory OTA
--include vendor/google/factoryota/client/factoryota.mk
+-include vendor/unbundled_google/packages/FactoryOtaPrebuilt/factoryota.mk
 
 # Set system properties identifying the chipset
 PRODUCT_VENDOR_PROPERTIES += ro.soc.manufacturer=Google

device-shipping-common.mk

@@ -20,10 +20,3 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.bluetooth.a2dp_offload.disabled=false \
     persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
 
-# SecureElement
-PRODUCT_PACKAGES += \
-    android.hardware.secure_element@1.2-service-gto
-
-PRODUCT_COPY_FILES += \
-    device/google/gs101/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf \
-    device/google/gs101/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf

device.mk

@@ -48,11 +48,7 @@ PRODUCT_SOONG_NAMESPACES += \
 	vendor/google_nos/host/android \
 	vendor/google_nos/test/system-test-harness
 
-ifeq ($(TARGET_PREBUILT_KERNEL),)
 LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
-else
-LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
-endif
 
 # OEM Unlock reporting
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
@@ -220,9 +216,6 @@ DEVICE_MATRIX_FILE := \
 
 DEVICE_PACKAGE_OVERLAYS += device/google/gs101/overlay
 
-# This device is shipped with 31 (Android S)
-PRODUCT_SHIPPING_API_LEVEL := 31
-
 # Enforce the Product interface
 PRODUCT_PRODUCT_VNDK_VERSION := current
 PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true
@@ -231,7 +224,7 @@ PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true
 PRODUCT_COPY_FILES += \
 	$(LOCAL_KERNEL):kernel \
 	device/google/gs101/conf/init.gs101.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs101.usb.rc \
-	device/google/gs101/conf/ueventd.gs101.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc
+	device/google/gs101/conf/ueventd.gs101.rc:$(TARGET_COPY_OUT_VENDOR)/etc/ueventd.rc
 
 PRODUCT_COPY_FILES += \
 	device/google/gs101/conf/init.gs101.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs101.rc
@@ -255,10 +248,13 @@ PRODUCT_COPY_FILES += \
 	device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.gs101.rc
 
 # Fstab files
+PRODUCT_PACKAGES += \
+	fstab.gs101 \
+	fstab.gs101.vendor_ramdisk \
+	fstab.gs101-fips \
+	fstab.gs101-fips.vendor_ramdisk
 PRODUCT_COPY_FILES += \
-	device/google/gs101/conf/fstab.gs101:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.gs101 \
+	device/google/gs101/conf/fstab.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist
-	device/google/gs101/conf/fstab.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist \
-	device/google/gs101/conf/fstab.gs101:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.gs101
 
 # Shell scripts
 PRODUCT_COPY_FILES += \
@@ -385,15 +381,11 @@ PRODUCT_PROPERTY_OVERRIDES += \
 endif
 
 # Power HAL
-PRODUCT_COPY_FILES += \
-	device/google/gs101/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
-
 PRODUCT_COPY_FILES += \
 	device/google/gs101/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json
-
+# Legacy HW
 PRODUCT_COPY_FILES += \
 	device/google/gs101/powerhint_a0.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint_a0.json
-
 PRODUCT_COPY_FILES += \
 	device/google/gs101/powerhint_a1.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint_a1.json
 -include hardware/google/pixel/power-libperfmgr/aidl/device.mk
@@ -483,20 +475,11 @@ PRODUCT_PACKAGES += \
 	android.hardware.drm@1.4-service.widevine \
 	liboemcrypto \
 
-ORIOLE_PRODUCT := %oriole
+
-RAVEN_PRODUCT := %raven
-ifneq (,$(filter $(ORIOLE_PRODUCT), $(TARGET_PRODUCT)))
-        LOCAL_TARGET_PRODUCT := oriole
-else ifneq (,$(filter $(RAVEN_PRODUCT), $(TARGET_PRODUCT)))
-        LOCAL_TARGET_PRODUCT := raven
-else
-        LOCAL_TARGET_PRODUCT := slider
-endif
 
 $(call soong_config_set,google3a_config,soc,gs101)
 $(call soong_config_set,google3a_config,gcam_awb,true)
 $(call soong_config_set,google3a_config,ghawb_truetone,true)
-$(call soong_config_set,google3a_config,target_device,$(LOCAL_TARGET_PRODUCT))
 
 # Determine if Lyric is in the tree, and only have GCH build against it
 # if it is. Cases when Lyric isn't going to be in the tree:
@@ -508,7 +491,11 @@ $(call soong_config_set,google3a_config,target_device,$(LOCAL_TARGET_PRODUCT))
 #    - PDK gs101 builds because they still have vendor/google/services/LyricCameraHAL/src
 
 ifneq ($(wildcard vendor/google/services/LyricCameraHAL/src),)
+$(call soong_config_set,lyric,soc,gs101)
 $(call soong_config_set,lyric,use_lyric_camera_hal,true)
+# lyric::tuning_product is set in device-specific makefiles,
+# such as device/google/raviole/device-oriole.mk
+
 # Camera HAL library selection
 $(call soong_config_set,gch,hwl_library,lyric)
 endif
@@ -877,7 +864,6 @@ USE_RADIO_HAL_1_6 := true
 
 ifneq ($(BOARD_WITHOUT_RADIO),true)
 $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/common/device-vendor.mk)
-PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.telephony.cdma.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.cdma.xml
 endif
 
 ifeq (,$(filter %_64,$(TARGET_PRODUCT)))
@@ -917,25 +903,6 @@ PRODUCT_PACKAGES_DEBUG += \
 	diag-vibrator-drv2624 \
 	$(NULL)
 
-# NFC
-PRODUCT_COPY_FILES += \
-	frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \
-	frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hce.xml \
-	frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml \
-	frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml \
-	frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.uicc.xml \
-	frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.ese.xml
-
-PRODUCT_PACKAGES += \
-	NfcNci \
-	Tag \
-	android.hardware.nfc@1.2-service.st
-
-# SecureElement
-PRODUCT_COPY_FILES += \
-	frameworks/native/data/etc/android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.ese.xml \
-	frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.uicc.xml
-
 PRODUCT_PACKAGES += \
 	android.hardware.health@2.1-impl-gs101 \
 	android.hardware.health@2.1-service
@@ -1085,10 +1052,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
     suspend.short_suspend_backoff_enabled=true \
     suspend.max_sleep_time_millis=40000
 
-# (b/183612348): Enable skia reduceOpsTaskSplitting
-PRODUCT_PROPERTY_OVERRIDES += \
-    renderthread.skia.reduceopstasksplitting=true
-
 # Enable Incremental on the device
 PRODUCT_PROPERTY_OVERRIDES += \
 	ro.incremental.enable=true

device_framework_matrix_product.xml

@@ -25,7 +25,7 @@
         </interface>
     </hal>
     <hal format="hidl" optional="true">
-        <name>com.fingerprints33.extension</name>
+        <name>com.fingerprints35.extension</name>
         <version>1.0</version>
         <interface>
             <name>IFingerprintAuthenticator</name>
@@ -56,13 +56,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="true">
-      <name>com.google.face.debug</name>
-        <interface>
-            <name>IDebugHost</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="aidl" optional="true">
       <name>com.google.edgetpu</name>
         <interface>
@@ -72,7 +65,7 @@
     </hal>
     <hal format="aidl" optional="true">
       <name>com.google.hardware.pixel.display</name>
-        <version>3</version>
+        <version>4</version>
         <interface>
             <name>IDisplay</name>
             <instance>default</instance>
@@ -157,14 +150,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
-        <name>vendor.google.wireless_charger</name>
-        <version>1.3</version>
-        <interface>
-            <name>IWirelessCharger</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.samsung_slsi.telephony.hardware.oemservice</name>
         <version>1.0</version>

device_framework_matrix_product_wireless.xml

@@ -0,0 +1,10 @@
+<compatibility-matrix version="1.0" type="framework" level="6">
+    <hal format="hidl" optional="true">
+        <name>vendor.google.wireless_charger</name>
+        <version>1.3</version>
+        <interface>
+            <name>IWirelessCharger</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</compatibility-matrix>

dumpstate/DumpstateDevice.cpp

@@ -195,7 +195,7 @@ void dumpGpsLogs(int fd, std::string destDir) {
     const std::string gpsLogDir = GPS_LOG_DIRECTORY;
     const std::string gpsTmpLogDir = gpsLogDir + "/.tmp";
     const std::string gpsDestDir = destDir + "/gps";
-    int maxFileNum = android::base::GetIntProperty(GPS_LOG_NUMBER_PROPERTY, 30);
+    int maxFileNum = android::base::GetIntProperty(GPS_LOG_NUMBER_PROPERTY, 20);
 
     RunCommandToFd(fd, "MKDIR GPS LOG", {"/vendor/bin/mkdir", "-p", gpsDestDir.c_str()},
                    CommandOptions::WithTimeout(2).Build());
@@ -337,12 +337,15 @@ void DumpstateDevice::dumpPowerSection(int fd) {
         DumpFileToFd(fd, "Power supply property maxfg", "/sys/class/power_supply/maxfg/uevent");
         DumpFileToFd(fd, "m5_state", "/sys/class/power_supply/maxfg/m5_model_state");
         DumpFileToFd(fd, "maxfg", "/dev/logbuffer_maxfg");
+        DumpFileToFd(fd, "maxfg", "/dev/logbuffer_maxfg_monitor");
     } else {
         DumpFileToFd(fd, "Power supply property maxfg_base", "/sys/class/power_supply/maxfg_base/uevent");
         DumpFileToFd(fd, "Power supply property maxfg_flip", "/sys/class/power_supply/maxfg_flip/uevent");
         DumpFileToFd(fd, "m5_state", "/sys/class/power_supply/maxfg_base/m5_model_state");
         DumpFileToFd(fd, "maxfg_base", "/dev/logbuffer_maxfg_base");
         DumpFileToFd(fd, "maxfg_flip", "/dev/logbuffer_maxfg_flip");
+        DumpFileToFd(fd, "maxfg_base", "/dev/logbuffer_maxfg_base_monitor");
+        DumpFileToFd(fd, "maxfg_flip", "/dev/logbuffer_maxfg_flip_monitor");
     }
 
     if (!stat("/dev/logbuffer_tcpm", &buffer)) {
@@ -355,6 +358,16 @@ void DumpstateDevice::dumpPowerSection(int fd) {
         }
     }
 
+    RunCommandToFd(fd, "TCPC", {"/vendor/bin/sh", "-c",
+		       "for f in /sys/devices/platform/10d50000.hsi2c/i2c-*/i2c-max77759tcpc;"
+		       "do echo \"registers:\"; cat $f/registers;"
+		       "echo \"frs:\"; cat $f/frs;"
+		       "echo \"auto_discharge:\"; cat $f/auto_discharge;"
+		       "echo \"bc12_enabled:\"; cat $f/bc12_enabled;"
+		       "echo \"cc_toggle_enable:\"; cat $f/cc_toggle_enable;"
+		       "echo \"contaminant_detection:\"; cat $f/contaminant_detection;"
+		       "echo \"contaminant_detection_status:\"; cat $f/contaminant_detection_status;  done"});
+
     DumpFileToFd(fd, "PD Engine", "/dev/logbuffer_usbpd");
     DumpFileToFd(fd, "PPS-google_cpm", "/dev/logbuffer_cpm");
     DumpFileToFd(fd, "PPS-dc", "/dev/logbuffer_pca9468");
@@ -378,10 +391,8 @@ void DumpstateDevice::dumpPowerSection(int fd) {
                         " for f in `ls bd_*` ; do echo \"$f: `cat $f`\" ; done"});
     if (!PropertiesHelper::IsUserBuild()) {
 
-        RunCommandToFd(fd, "DC_registers dump", {"/vendor/bin/sh", "-c",
+        DumpFileToFd(fd, "DC_registers dump", "/sys/class/power_supply/pca9468-mains/device/registers_dump");
-                        "for f in /d/regmap/*-0057-pca9468-mains ; do "
+
-                        "regs=`cat $f/registers`; echo $f: ;"
-                        "echo \"$regs\"; done"});
 
         RunCommandToFd(fd, "fg_model", {"/vendor/bin/sh", "-c",
                         "for f in /d/maxfg* ; do "
@@ -401,7 +412,7 @@ void DumpstateDevice::dumpPowerSection(int fd) {
 
         /* FG Registers */
         RunCommandToFd(fd, "fg registers", {"/vendor/bin/sh", "-c",
-                        "for f in /d/regmap/*-0036 ; do "
+                        "for f in /d/maxfg* ; do "
                         "regs=`cat $f/registers`; echo $f: ;"
                         "echo \"$regs\"; done"});
     }
@@ -480,6 +491,12 @@ void DumpstateDevice::dumpThermalSection(int fd) {
                    "for f in /sys/class/thermal/cooling* ; do "
                        "type=`cat $f/type` ; state2power_table=`cat $f/state2power_table` ; echo \"$type: $state2power_table\" ; "
                        "done"});
+    DumpFileToFd(fd, "TMU state:", "/sys/module/gs101_thermal/parameters/tmu_reg_dump_state");
+    DumpFileToFd(fd, "TMU current temperature:", "/sys/module/gs101_thermal/parameters/tmu_reg_dump_current_temp");
+    DumpFileToFd(fd, "TMU_TOP rise thresholds:", "/sys/module/gs101_thermal/parameters/tmu_top_reg_dump_rise_thres");
+    DumpFileToFd(fd, "TMU_TOP fall thresholds:", "/sys/module/gs101_thermal/parameters/tmu_top_reg_dump_fall_thres");
+    DumpFileToFd(fd, "TMU_SUB rise thresholds:", "/sys/module/gs101_thermal/parameters/tmu_sub_reg_dump_rise_thres");
+    DumpFileToFd(fd, "TMU_SUB fall thresholds:", "/sys/module/gs101_thermal/parameters/tmu_sub_reg_dump_fall_thres");
 }
 
 // Dump items related to touch
@@ -529,6 +546,12 @@ void DumpstateDevice::dumpTouchSection(int fd) {
 
         snprintf(cmd, sizeof(cmd), "%s", stm_cmd_path[i + 1]);
         if (!access(cmd, R_OK)) {
+            snprintf(cmd, sizeof(cmd),
+                     "echo 01 A4 06 C3 > %s; echo 02 A7 00 00 00 40 00 > %s && cat %s",
+                     stm_cmd_path[i + 1], stm_cmd_path[i + 1], stm_cmd_path[i + 1]);
+            RunCommandToFd(fd, "HDM debug information (32 bytes)",
+                           {"/vendor/bin/sh", "-c", cmd});
+
             snprintf(cmd, sizeof(cmd), "echo 23 00 > %s && cat %s",
                      stm_cmd_path[i + 1], stm_cmd_path[i + 1]);
             RunCommandToFd(fd, "Mutual Raw Data",
@@ -594,7 +617,7 @@ void DumpstateDevice::dumpTouchSection(int fd) {
                            {"/vendor/bin/sh", "-c", cmd});
 
             snprintf(cmd, sizeof(cmd),
-                     "echo 01 A4 06 C3 > %s; echo 02 A7 00 00 00 20 00 > %s && cat %s",
+                     "echo 01 A4 06 C3 > %s; echo 02 A7 00 00 00 40 00 > %s && cat %s",
                      stm_cmd_path[i + 1], stm_cmd_path[i + 1], stm_cmd_path[i + 1]);
             RunCommandToFd(fd, "HDM debug information (32 bytes)",
                            {"/vendor/bin/sh", "-c", cmd});
@@ -890,6 +913,7 @@ void DumpstateDevice::dumpAoCSection(int fd) {
     DumpFileToFd(fd, "AoC logging wake", "/sys/devices/platform/19000000.aoc/control/logging_wakeup");
     DumpFileToFd(fd, "AoC hotword wake", "/sys/devices/platform/19000000.aoc/control/hotword_wakeup");
     DumpFileToFd(fd, "AoC memory exception wake", "/sys/devices/platform/19000000.aoc/control/memory_exception");
+    DumpFileToFd(fd, "AoC memory votes", "/sys/devices/platform/19000000.aoc/control/memory_votes");
 }
 
 // Dump items related to sensors usf.

factory/launcher3/res/xml/default_workspace_5x5.xml

@@ -17,7 +17,7 @@
 <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 -->
+    <!-- Dialer, android test tool, label barcode, battery charge tool, barcode scanner -->
     <resolve
         launcher:container="-101"
         launcher:screen="0"
@@ -28,6 +28,36 @@
         <favorite launcher:uri="#Intent;action=android.intent.action.CALL_BUTTON;end" />
     </resolve>
 
+    <resolve
+        launcher:container="-101"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="0" >
+        <favorite
+            launcher:packageName="com.google_npi.androidtesttool"
+            launcher:className="com.google_npi.androidtesttool.MainActivity" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="2"
+        launcher:x="2"
+        launcher:y="0" >
+        <favorite
+            launcher:packageName="com.google_cte.labelbarcode"
+            launcher:className="com.google_cte.labelbarcode.LabelBarcodeMainActivity" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="3"
+        launcher:x="3"
+        launcher:y="0" >
+        <favorite
+            launcher:packageName="com.google.batterychargetool"
+            launcher:className="com.google.batterychargetool.MainActivity" />
+    </resolve>
+
     <resolve
         launcher:container="-101"
         launcher:screen="4"

factory_common.mk

@@ -32,7 +32,6 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.vendor.camera.partial_result_count=1 \
     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 \
@@ -42,7 +41,9 @@ PRODUCT_PROPERTY_OVERRIDES += \
     vendor.camera.debug.force_rectiface_node_on=0 \
     vendor.camera.debug.force_steadiface_on=0 \
     vendor.camera.debug.force_tnr_on=0 \
-    vendor.camera.debug.local_tone_mapping_controller_v1.mode=0
+    vendor.camera.debug.local_tone_mapping_controller_v1.mode=0 \
+    vendor.camera.debug.force_segmentation_node_on=0 \
+    vendor.camera.debug.enable_saliency=0
 
 # Disable ScreenDecorations for factory builds
 PRODUCT_PROPERTY_OVERRIDES += \

fingerprint/fpc1540/fp_tool/Android.bp

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

fingerprint/fpc1540/fp_tool/fp_test.cpp

@@ -0,0 +1,200 @@
+#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

@@ -0,0 +1,16 @@
+#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/gs101/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/gs101/fingerprint/fpc1540/fingerprint_config_factory.mk
-
-PRODUCT_PACKAGES += \
-    fpc_tee_test\
-    SensorTestTool \
-
-PRODUCT_PACKAGES += \
-    com.fingerprints.extension.xml \
-    com.fingerprints.extension \

fingerprint/fpc1540/sw33/fingerprint_aidl_config.mk

@@ -1,18 +1,18 @@
 # ----------------------------
 # Add feature flags below
 # ----------------------------
-FPC_CONFIG_BUILD_VERSION=33
+FPC_CONFIG_BUILD_VERSION=33_aidl
-FPC_CONFIG_CAPACITIVE=1
+FPC_CONFIG_GOOGLE_CUSTOMIZE=1
 FPC_CONFIG_MAX_NR_TEMPLATES=5
+FPC_CONFIG_NAVIGATION=1
 FPC_CONFIG_SENSE_TOUCH_CALIBRATION_PATH=/data/fpc/calibration_sense_touch.dat
+FPC_CONFIG_SENSORTEST=1
 FPC_CONFIG_TA_FS=1
 FPC_DEFECTIVE_PIXEL_LIST_SIZE=5000
+FPC_HAL_SHARED_LIB=1
 FPC_SENSOR_SDK_LOG_LEVEL=3
 FPC_TEE_RUNTIME=TRUSTY
 LIBFPC_NAME=libfpc1541_S_nav_debug.a
 FPC_CONFIG_DEBUG=1
+FPC_CONFIG_ENGINEERING=1
 FPC_CONFIG_PRODUCT_DEFAULT=FPC_PRODUCT_TYPE1541_S
-
-#
-# File included from device/<manufacture>/<>/<device>.mk
-# Packages to include into the build

fingerprint/fpc1540/sw33/fingerprint_hidl_config_factory.mk

@@ -16,6 +16,5 @@ FPC_CONFIG_DEBUG=1
 FPC_CONFIG_ENGINEERING=1
 FPC_CONFIG_PRODUCT_DEFAULT=FPC_PRODUCT_TYPE1541_S
 
-#
+# Google configuration
-# File included from device/<manufacture>/<>/<device>.mk
+GOOGLE_CONFIG_FP_STATUS=1
-# Packages to include into the build

fingerprint/fpc1540/sw33/fpc1540.mk

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

fingerprint/fpc1540/sw35/fingerprint_aidl_config.mk

@@ -0,0 +1,23 @@
+# ----------------------------
+# Add feature flags below
+# ----------------------------
+FPC_BUILD_ID='ff334fee0631b7d5e424e22d18287f4f'
+FPC_CONFIG_BUILD_VERSION=35
+FPC_CONFIG_GOOGLE_CUSTOMIZE=1
+FPC_CONFIG_MAX_NR_TEMPLATES=5
+FPC_CONFIG_SENSE_TOUCH_CALIBRATION_PATH=/data/fpc/calibration_sense_touch.dat
+FPC_CONFIG_SENSORTEST=1
+FPC_CONFIG_TA_FS=1
+FPC_DEFECTIVE_PIXEL_LIST_SIZE=5000
+FPC_HAL_SHARED_LIB=1
+FPC_SENSOR_SDK_LOG_LEVEL=3
+FPC_TEE_RUNTIME=TRUSTY
+LIBFPC_NAME=libfpcmulti_debug.a
+FPC_CONFIG_DEBUG=1
+FPC_CONFIG_ENGINEERING=1
+
+FPC_CONFIG_GOOGLE_CUSTOMIZE=1
+GOOGLE_CONFIG_PERFORMANCE=1
+
+# Enable Suez
+$(call soong_config_set,fp_hal_feature,biometric_suez_support,true)

fingerprint/fpc1540/sw35/fingerprint_hidl_config_factory.mk

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

fingerprint/fpc1540/sw35/fpc1540.mk

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

fingerprint/udfps_common.mk

@@ -24,7 +24,14 @@ DEVICE_MANIFEST_FILE += \
 endif
 
 # Include the Goodix AIDL HAL namespaces.
+ifeq ($(GOODIX_CONFIG_BUILD_VERSION), g6_trusty)
 PRODUCT_SOONG_NAMESPACES += vendor/goodix/udfps/g6_trusty
 PRODUCT_SOONG_NAMESPACES += vendor/goodix/udfps/g6_aidl_trusty
+else ifeq ($(GOODIX_CONFIG_BUILD_VERSION), g7_trusty)
+PRODUCT_SOONG_NAMESPACES += vendor/goodix/udfps/g7_trusty
+PRODUCT_SOONG_NAMESPACES += vendor/goodix/udfps/g7_aidl_trusty
+else
+$(error Invalid udfps build version)
+endif
 
 $(call soong_config_set,fp_hal_feature,biometric_suez_support,true)

gnss/47765/config/gps.xml

@@ -5,9 +5,9 @@
        BaudRate="921600"
        GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
        CustGpioDelayMs="250"
-       LogEnabled="false"
+       LogEnabled="true"
        Log="JAVA"
-       SecondaryConfigPath="/vendor/etc/gnss/gps2.xml"
+       SecondaryConfigPath="/data/vendor/gps/overlay/gps_overlay.xml"
        LogDirectory="/sdcard/gps/broadcom/storage/"
        CtrlPipe="/data/vendor/gps/glgpsctrl"
        NmeaOutName="/data/vendor/gps/nmea_out"
@@ -51,7 +51,9 @@
 
        AttributionAppPkgName="com.google.android.carrierlocation"
 
-       AssertEnabled="false"
+       AssertEnabled="true"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
   />
 
   <gll
@@ -75,10 +77,11 @@
        RfPathLossDb_Cp_L5="3.5"
        OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
 
+       EnableOnChipStopNotification="2"
+       PowerMode="3"
   />
 
   <gll_features
-       EnableLowPowerPmm="true"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />

gnss/47765/config/gps.xml.oriole

@@ -5,9 +5,9 @@
        BaudRate="921600"
        GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
        CustGpioDelayMs="250"
-       LogEnabled="false"
+       LogEnabled="true"
        Log="JAVA"
-       SecondaryConfigPath="/vendor/etc/gnss/gps2.xml"
+       SecondaryConfigPath="/data/vendor/gps/overlay/gps_overlay.xml"
        LogDirectory="/sdcard/gps/broadcom/storage/"
        CtrlPipe="/data/vendor/gps/glgpsctrl"
        NmeaOutName="/data/vendor/gps/nmea_out"
@@ -51,7 +51,9 @@
 
        AttributionAppPkgName="com.google.android.carrierlocation"
 
-       AssertEnabled="false"
+       AssertEnabled="true"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
   />
 
   <gll
@@ -75,10 +77,11 @@
        RfPathLossDb_Cp_L5="4.1"
        OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
 
+       EnableOnChipStopNotification="2"
+       PowerMode="3"
   />
 
   <gll_features
-       EnableLowPowerPmm="true"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />

gnss/47765/config/gps.xml.raven

@@ -5,9 +5,9 @@
        BaudRate="921600"
        GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
        CustGpioDelayMs="250"
-       LogEnabled="false"
+       LogEnabled="true"
        Log="JAVA"
-       SecondaryConfigPath="/vendor/etc/gnss/gps2.xml"
+       SecondaryConfigPath="/data/vendor/gps/overlay/gps_overlay.xml"
        LogDirectory="/sdcard/gps/broadcom/storage/"
        CtrlPipe="/data/vendor/gps/glgpsctrl"
        NmeaOutName="/data/vendor/gps/nmea_out"
@@ -51,7 +51,9 @@
 
        AttributionAppPkgName="com.google.android.carrierlocation"
 
-       AssertEnabled="false"
+       AssertEnabled="true"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
   />
 
   <gll
@@ -75,10 +77,11 @@
        RfPathLossDb_Cp_L5="4"
        OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
 
+       EnableOnChipStopNotification="2"
+       PowerMode="3"
   />
 
   <gll_features
-       EnableLowPowerPmm="true"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />

gnss/47765/config/gps2.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
-  <hal
-       LogEnabled="true"
-       Log="JAVA"
-       AssertEnabled="true"
-  />
-  <gll
-       EnableOnChipStopNotification="false"
-  />
-</glgps>
-

gnss/47765/config/gps_user.xml

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="false"
+       Log="JAVA"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="false"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplEnable="true"
+       SuplUseApn="true"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpGuardTimeSec="1"
+       CpLppGuardTimeSec="1"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="false"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
+  />
+
+  <gll
+       LogPriMask="LOG_INFO"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
+       RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="13.0"
+       EnableFilteringForLTEB13="true"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="3.5"
+       RfPathLossDb_Cp="3.5"
+       RfPathLossDb_Ap_L5="3.5"
+       RfPathLossDb_Cp_L5="3.5"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="false"
+       PowerMode="3"
+  />
+
+  <gll_features
+       EnableNicAutoSwitch="true"
+       EnableNavic="true"
+  />
+
+</glgps>
+

gnss/47765/config/gps_user.xml.oriole

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="false"
+       Log="JAVA"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="false"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplEnable="true"
+       SuplUseApn="true"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpGuardTimeSec="1"
+       CpLppGuardTimeSec="1"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="false"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
+  />
+
+  <gll
+       LogPriMask="LOG_INFO"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
+       RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="9.3"
+       EnableFilteringForLTEB13="true"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="4.2"
+       RfPathLossDb_Cp="4.2"
+       RfPathLossDb_Ap_L5="4.1"
+       RfPathLossDb_Cp_L5="4.1"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="false"
+       PowerMode="3"
+  />
+
+  <gll_features
+       EnableNicAutoSwitch="true"
+       EnableNavic="true"
+  />
+
+</glgps>
+

gnss/47765/config/gps_user.xml.raven

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="false"
+       Log="JAVA"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="false"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplEnable="true"
+       SuplUseApn="true"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpGuardTimeSec="1"
+       CpLppGuardTimeSec="1"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="false"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
+  />
+
+  <gll
+       LogPriMask="LOG_INFO"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
+       RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="10.6"
+       EnableFilteringForLTEB13="true"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="4.1"
+       RfPathLossDb_Cp="4.1"
+       RfPathLossDb_Ap_L5="4"
+       RfPathLossDb_Cp_L5="4"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="false"
+       PowerMode="3"
+  />
+
+  <gll_features
+       EnableNicAutoSwitch="true"
+       EnableNavic="true"
+  />
+
+</glgps>
+

gnss/47765/config/lhd.conf

@@ -5,9 +5,9 @@ GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandb
 
 LhePatch=/vendor/firmware/SensorHub.patch
 Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
-# LheConsole=/data/vendor/gps/LheConsole
+LheConsole=/data/vendor/gps/LheConsole
 
-LogEnabled=false
+LogEnabled=true
 Log=JAVA
 LogDirectory=/sdcard/gps/broadcom/storage
 
@@ -17,7 +17,8 @@ LheBbdControl=/dev/bbd_control
 
 # LheBbdSensor=/dev/bbd_sensor
 
-# LheFailSafe=/data/vendor/gps/esw-crash-dump.txt
+LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt
+LogLevel=*:I
 
 NvStorageDir=/data/vendor/gps/
 
@@ -26,7 +27,7 @@ NvStorageDir=/data/vendor/gps/
 
 LheAutoBaudDelayMS=10
 TrafficLogEnabled=false
-SecondaryConfigPath=/vendor/etc/gnss/lhd2.conf
+SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf
 
 SkipSensorWakeLock=true
 LoggerWakeLockEnable=false

gnss/47765/config/lhd2.conf

@@ -1,5 +0,0 @@
-LheConsole=/data/vendor/gps/LheConsole
-LogEnabled=true
-Log=JAVA
-LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt
-LogLevel=*:I

gnss/47765/config/lhd_user.conf

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

gnss/47765/config/scd.conf

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

gnss/47765/config/scd2.conf

@@ -1,2 +0,0 @@
-LogEnabled=true
-Log=JAVA

gnss/47765/config/scd_user.conf

@@ -0,0 +1,5 @@
+LogEnabled=false
+Log=JAVA
+LogDirectory=/sdcard/gps/broadcom/storage
+NvStorageDir=/data/vendor/gps/
+TcpConnectionTimeout=20

gnss/device-gnss.mk

@@ -1,24 +1,36 @@
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml \
-	device/google/gs101/gnss/47765/config/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-	device/google/gs101/gnss/47765/config/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf \
 	device/google/gs101/gnss/47765/config/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer \
 	device/google/gs101/gnss/47765/firmware/SensorHub.patch:$(TARGET_COPY_OUT_VENDOR)/firmware/SensorHub.patch
 
-ifneq (,$(filter raven, $(TARGET_PRODUCT)))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_COPY_FILES += device/google/gs101/gnss/47765/config/gps.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+	PRODUCT_COPY_FILES += \
-else ifneq (,$(filter oriole, $(TARGET_PRODUCT)))
+		device/google/gs101/gnss/47765/config/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-PRODUCT_COPY_FILES += device/google/gs101/gnss/47765/config/gps.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+		device/google/gs101/gnss/47765/config/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
 else
-PRODUCT_COPY_FILES += device/google/gs101/gnss/47765/config/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+	PRODUCT_COPY_FILES += \
+		device/google/gs101/gnss/47765/config/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+		device/google/gs101/gnss/47765/config/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
 endif
 
+ifneq (,$(filter raven, $(subst _, ,$(TARGET_PRODUCT))))
 	ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-# userdebug specific
+		PRODUCT_COPY_FILES += device/google/gs101/gnss/47765/config/gps.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
-PRODUCT_COPY_FILES += \
+	else
-	device/google/gs101/gnss/47765/config/lhd2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd2.conf \
+		PRODUCT_COPY_FILES += device/google/gs101/gnss/47765/config/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
-	device/google/gs101/gnss/47765/config/scd2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd2.conf \
+	endif
-	device/google/gs101/gnss/47765/config/gps2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps2.xml
+else ifneq (,$(filter oriole, $(subst _, ,$(TARGET_PRODUCT))))
+	ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+		PRODUCT_COPY_FILES += device/google/gs101/gnss/47765/config/gps.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+	else
+		PRODUCT_COPY_FILES += device/google/gs101/gnss/47765/config/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+	endif
+else ifneq (,$(filter slider whitefin, $(subst _, ,$(TARGET_PRODUCT))))
+	ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+		PRODUCT_COPY_FILES += device/google/gs101/gnss/47765/config/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+	else
+		PRODUCT_COPY_FILES += device/google/gs101/gnss/47765/config/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+	endif
 endif
 
 PRODUCT_SOONG_NAMESPACES += \

interfaces/boot/1.2/BootControl.cpp

@@ -162,7 +162,7 @@ static bool DevInfoSync() {
         return false;
     }
 
-    android::base::unique_fd fd(open(DEVINFO_PATH, O_WRONLY));
+    android::base::unique_fd fd(open(DEVINFO_PATH, O_WRONLY | O_DSYNC));
     return android::base::WriteFully(fd, &devinfo, sizeof devinfo);
 }
 
@@ -270,13 +270,13 @@ Return<void> BootControl::setActiveBootSlot(uint32_t slot, setActiveBootSlot_cb
 
     std::string boot_lun_path =
             std::string("/sys/devices/platform/") + boot_dev + "/pixel/boot_lun_enabled";
-    int fd = open(boot_lun_path.c_str(), O_RDWR);
+    int fd = open(boot_lun_path.c_str(), O_RDWR | O_DSYNC);
     if (fd < 0) {
         // Try old path for kernels < 5.4
         // TODO: remove once kernel 4.19 support is deprecated
         std::string boot_lun_path =
                 std::string("/sys/devices/platform/") + boot_dev + "/attributes/boot_lun_enabled";
-        fd = open(boot_lun_path.c_str(), O_RDWR);
+        fd = open(boot_lun_path.c_str(), O_RDWR | O_DSYNC);
         if (fd < 0) {
             _hidl_cb({false, "failed to open ufs attr boot_lun_enabled"});
             return Void();

manifest-gralloc3.xml

@@ -157,15 +157,6 @@
        <transport>hwbinder</transport>
        <fqname>@1.3::IDevice/google-edgetpu</fqname>
     </hal>
-    <hal format="hidl">
-       <name>android.hardware.nfc</name>
-       <transport>hwbinder</transport>
-       <version>1.2</version>
-       <interface>
-           <name>INfc</name>
-           <instance>default</instance>
-       </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.health</name>
         <transport>hwbinder</transport>

manifest.xml

@@ -108,15 +108,6 @@
         </interface>
         <fqname>@1.3::IDevice/google-armnn</fqname>
     </hal>
-    <hal format="hidl">
-       <name>android.hardware.nfc</name>
-       <transport>hwbinder</transport>
-       <version>1.2</version>
-       <interface>
-           <name>INfc</name>
-           <instance>default</instance>
-       </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.health</name>
         <transport>hwbinder</transport>

manifest_64-gralloc3.xml

@@ -146,15 +146,6 @@
        <transport>hwbinder</transport>
        <fqname>@1.3::IDevice/google-edgetpu</fqname>
     </hal>
-    <hal format="hidl">
-       <name>android.hardware.nfc</name>
-       <transport>hwbinder</transport>
-       <version>1.2</version>
-       <interface>
-           <name>INfc</name>
-           <instance>default</instance>
-       </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.health</name>
         <transport>hwbinder</transport>

manifest_64.xml

@@ -109,15 +109,6 @@
        <transport>hwbinder</transport>
        <fqname>@1.3::IDevice/google-edgetpu</fqname>
     </hal>
-    <hal format="hidl">
-       <name>android.hardware.nfc</name>
-       <transport>hwbinder</transport>
-       <version>1.2</version>
-       <interface>
-           <name>INfc</name>
-           <instance>default</instance>
-       </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.health</name>
         <transport>hwbinder</transport>

nfc/libese-hal-st.conf

@@ -1,6 +0,0 @@
-########################### Start of libese-hal-st.conf ###########################
-###############################################################################
-###############################################################################
-# ST HAL trace log level
-STESE_HAL_LOGLEVEL=1
-ST_ESE_DEV_NODE="/dev/st54j_se"

nfc/libnfc-hal-st-gs101.conf

@@ -1,152 +0,0 @@
-########################### Start of libnf-hal-st_aosp.conf ###########################
-
-###############################################################################
-###############################################################################
-# ST HAL trace log level
-STNFC_HAL_LOGLEVEL=4
-NFC_DEBUG_ENABLED=1
-
-###############################################################################
-# Vendor specific mode to enable FW (RF & SWP) traces.
-STNFC_FW_DEBUG_ENABLED=0
-
-###############################################################################
-# File used for NFA storage
-NFA_STORAGE="/data/nfc"
-
-###############################################################################
-# Dev Node used for ST HAL
-ST_NFC_DEV_NODE="/dev/st_no_such_device"
-
-###############################################################################
-# Keep the nfa storage file.
-PRESERVE_STORAGE=1
-
-###############################################################################
-# In Switch OFF mode (phone switched-off), specify the desired CE mode to
-# the controller.
-# 0: No card-emulation; DEFAULT
-# 1: Switch-off card-emulation enabled
-CE_ON_SWITCH_OFF_STATE=1
-
-###############################################################################
-# Vendor specific mode to support the USB charging mode if VPSIO=1 in switch off.
-STNFC_USB_CHARGING_MODE=1
-
-###############################################################################
-# Vendor Specific Proprietary Protocol & Discovery Configuration
-# Set to 0xFF if unsupported
-#  byte[0] NCI_PROTOCOL_18092_ACTIVE
-#  byte[1] NCI_PROTOCOL_B_PRIME
-#  byte[2] NCI_PROTOCOL_DUAL
-#  byte[3] NCI_PROTOCOL_15693
-#  byte[4] NCI_PROTOCOL_KOVIO
-#  byte[5] NCI_PROTOCOL_MIFARE
-#  byte[6] NCI_DISCOVERY_TYPE_POLL_KOVIO
-#  byte[7] NCI_DISCOVERY_TYPE_POLL_B_PRIME
-#  byte[8] NCI_DISCOVERY_TYPE_LISTEN_B_PRIME
-NFA_PROPRIETARY_CFG={05:FF:FF:06:8A:90:77:FF:FF}
-
-###############################################################################
-# Choose the presence-check algorithm for type-4 tag.  If not defined,
-# the default value is 1.
-# 0  NFA_RW_PRES_CHK_DEFAULT; Let stack selects an algorithm
-# 1  NFA_RW_PRES_CHK_I_BLOCK; ISO-DEP protocol's empty I-block
-# 2  NFA_RW_PRES_CHK_RESET; Deactivate to Sleep, then re-activate
-# 3  NFA_RW_PRES_CHK_RB_CH0; Type-4 tag protocol's ReadBinary command on channel 0
-# 4  NFA_RW_PRES_CHK_RB_CH3; Type-4 tag protocol's ReadBinary command on channel 3
-# 5  NFA_RW_PRES_CHK_ISO_DEP_NAK; presence check command ISO-DEP NAK as per NCI2.0
-PRESENCE_CHECK_ALGORITHM=5
-
-###############################################################################
-# Name of the NCI HAL module to use
-# If unset, falls back to nfc_nci.bcm2079x
-NCI_HAL_MODULE="nfc_nci.st21nfc"
-
-###############################################################################
-# White list to be set at startup.
-DEVICE_HOST_WHITE_LIST={02:C0}
-
-###############################################################################
-# BAIL OUT value for P2P
-# Implements algorithm for NFC-DEP protocol priority over ISO-DEP protocol.
-POLL_BAIL_OUT_MODE=1
-
-###############################################################################
-# Extended APDU length for ISO_DEP
-ISO_DEP_MAX_TRANSCEIVE=0xFEFF
-
-###############################################################################
-# Configure the NFC Extras to open and use a static pipe.  If the value is
-# not set or set to 0, then the default is use a dynamic pipe based on a
-# destination gate (see NFA_HCI_DEFAULT_DEST_GATE).  Note there is a value
-# for each EE (ESE/SIM)
-OFF_HOST_ESE_PIPE_ID=0x5E
-OFF_HOST_SIM_PIPE_ID=0x3E
-
-###############################################################################
-#Set the default Felica T3T System Code OffHost route Location :
-#This settings will be used when application does not set this parameter
-# host  0x00
-# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
-# UICC  0x81 (UICC_1), 0x85 (UICC_2)
-DEFAULT_SYS_CODE_ROUTE=0x86
-
-###############################################################################
-#Set the Felica T3T System Code supported power state:
-DEFAULT_SYS_CODE_PWR_STATE=0x3B
-
-###############################################################################
-# Path and Files used for FW update binaries storage
-STNFC_FW_PATH_STORAGE="/vendor/firmware"
-STNFC_FW_BIN_NAME="/st54j_fw.bin"
-STNFC_FW_CONF_NAME="/st54j_conf.bin"
-
-###############################################################################
-# Default off-host route for Felica.
-# This settings will be used when application does not set this parameter
-# host  0x00
-# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
-# UICC  0x81 (UICC_1), 0x85 (UICC_2)
-DEFAULT_NFCF_ROUTE=0x86
-
-###############################################################################
-# Configure the default off-host route.
-# used for technology A and B routing
-# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
-# UICC  0x81 (UICC_1), 0x85 (UICC_2)
-DEFAULT_OFFHOST_ROUTE=0x81
-
-###############################################################################
-# Configure the default AID route.
-# host  0x00
-# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
-# UICC  0x81 (UICC_1), 0x85 (UICC_2)
-DEFAULT_ROUTE=0x00
-
-###############################################################################
-# Configure the NFCEEIDs of offhost UICC.
-# UICC  0x81 (UICC_1), 0x85 (UICC_2)
-OFFHOST_ROUTE_UICC={81}
-
-###############################################################################
-# Configure the NFCEEIDs of offhost eSEs.
-# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
-OFFHOST_ROUTE_ESE={86}
-
-###############################################################################
-# Configure the list of NFCEE for the ISO-DEP routing.
-# host  0x00
-# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
-# UICC  0x81 (UICC_1), 0x85 (UICC_2)
-DEFAULT_ISODEP_ROUTE=0x81
-
-###############################################################################
-# Core configuration settings
-CORE_CONF_PROP={ 20, 02, 0a, 03,
-        a1, 01, 1e,
-        a2, 01, 19,
-        80, 01, 01
-}
-
-

nfc/libnfc-hal-st.conf

@@ -1,148 +0,0 @@
-########################### Start of libnf-hal-st_aosp.conf ###########################
-
-###############################################################################
-###############################################################################
-# ST HAL trace log level
-STNFC_HAL_LOGLEVEL=1
-NFC_DEBUG_ENABLED=1
-
-###############################################################################
-# Vendor specific mode to enable FW (RF & SWP) traces.
-STNFC_FW_DEBUG_ENABLED=0
-
-###############################################################################
-# File used for NFA storage
-NFA_STORAGE="/data/nfc"
-
-###############################################################################
-# Keep the nfa storage file.
-PRESERVE_STORAGE=1
-
-###############################################################################
-# In Switch OFF mode (phone switched-off), specify the desired CE mode to
-# the controller.
-# 0: No card-emulation; DEFAULT
-# 1: Switch-off card-emulation enabled
-CE_ON_SWITCH_OFF_STATE=1
-
-###############################################################################
-# Vendor specific mode to support the USB charging mode if VPSIO=1 in switch off.
-STNFC_USB_CHARGING_MODE=1
-
-###############################################################################
-# Vendor Specific Proprietary Protocol & Discovery Configuration
-# Set to 0xFF if unsupported
-#  byte[0] NCI_PROTOCOL_18092_ACTIVE
-#  byte[1] NCI_PROTOCOL_B_PRIME
-#  byte[2] NCI_PROTOCOL_DUAL
-#  byte[3] NCI_PROTOCOL_15693
-#  byte[4] NCI_PROTOCOL_KOVIO
-#  byte[5] NCI_PROTOCOL_MIFARE
-#  byte[6] NCI_DISCOVERY_TYPE_POLL_KOVIO
-#  byte[7] NCI_DISCOVERY_TYPE_POLL_B_PRIME
-#  byte[8] NCI_DISCOVERY_TYPE_LISTEN_B_PRIME
-NFA_PROPRIETARY_CFG={05:FF:FF:06:8A:90:77:FF:FF}
-
-###############################################################################
-# Choose the presence-check algorithm for type-4 tag.  If not defined,
-# the default value is 1.
-# 0  NFA_RW_PRES_CHK_DEFAULT; Let stack selects an algorithm
-# 1  NFA_RW_PRES_CHK_I_BLOCK; ISO-DEP protocol's empty I-block
-# 2  NFA_RW_PRES_CHK_RESET; Deactivate to Sleep, then re-activate
-# 3  NFA_RW_PRES_CHK_RB_CH0; Type-4 tag protocol's ReadBinary command on channel 0
-# 4  NFA_RW_PRES_CHK_RB_CH3; Type-4 tag protocol's ReadBinary command on channel 3
-# 5  NFA_RW_PRES_CHK_ISO_DEP_NAK; presence check command ISO-DEP NAK as per NCI2.0
-PRESENCE_CHECK_ALGORITHM=5
-
-###############################################################################
-# Name of the NCI HAL module to use
-# If unset, falls back to nfc_nci.bcm2079x
-NCI_HAL_MODULE="nfc_nci.st21nfc"
-
-###############################################################################
-# White list to be set at startup.
-DEVICE_HOST_WHITE_LIST={02:C0}
-
-###############################################################################
-# BAIL OUT value for P2P
-# Implements algorithm for NFC-DEP protocol priority over ISO-DEP protocol.
-POLL_BAIL_OUT_MODE=1
-
-###############################################################################
-# Extended APDU length for ISO_DEP
-ISO_DEP_MAX_TRANSCEIVE=0xFEFF
-
-###############################################################################
-# Configure the NFC Extras to open and use a static pipe.  If the value is
-# not set or set to 0, then the default is use a dynamic pipe based on a
-# destination gate (see NFA_HCI_DEFAULT_DEST_GATE).  Note there is a value
-# for each EE (ESE/SIM)
-OFF_HOST_ESE_PIPE_ID=0x5E
-OFF_HOST_SIM_PIPE_ID=0x3E
-
-###############################################################################
-#Set the default Felica T3T System Code OffHost route Location :
-#This settings will be used when application does not set this parameter
-# host  0x00
-# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
-# UICC  0x81 (UICC_1), 0x85 (UICC_2)
-DEFAULT_SYS_CODE_ROUTE=0x86
-
-###############################################################################
-#Set the Felica T3T System Code supported power state:
-DEFAULT_SYS_CODE_PWR_STATE=0x3B
-
-###############################################################################
-# Path and Files used for FW update binaries storage
-STNFC_FW_PATH_STORAGE="/vendor/firmware"
-STNFC_FW_BIN_NAME="/st54j_fw.bin"
-STNFC_FW_CONF_NAME="/st54j_conf.bin"
-
-###############################################################################
-# Default off-host route for Felica.
-# This settings will be used when application does not set this parameter
-# host  0x00
-# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
-# UICC  0x81 (UICC_1), 0x85 (UICC_2)
-DEFAULT_NFCF_ROUTE=0x86
-
-###############################################################################
-# Configure the default off-host route.
-# used for technology A and B routing
-# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
-# UICC  0x81 (UICC_1), 0x85 (UICC_2)
-DEFAULT_OFFHOST_ROUTE=0x81
-
-###############################################################################
-# Configure the default AID route.
-# host  0x00
-# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
-# UICC  0x81 (UICC_1), 0x85 (UICC_2)
-DEFAULT_ROUTE=0x00
-
-###############################################################################
-# Configure the NFCEEIDs of offhost UICC.
-# UICC  0x81 (UICC_1), 0x85 (UICC_2)
-OFFHOST_ROUTE_UICC={81}
-
-###############################################################################
-# Configure the NFCEEIDs of offhost eSEs.
-# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
-OFFHOST_ROUTE_ESE={86}
-
-###############################################################################
-# Configure the list of NFCEE for the ISO-DEP routing.
-# host  0x00
-# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
-# UICC  0x81 (UICC_1), 0x85 (UICC_2)
-DEFAULT_ISODEP_ROUTE=0x81
-
-###############################################################################
-# Core configuration settings
-CORE_CONF_PROP={ 20, 02, 0a, 03,
-        a1, 01, 1e,
-        a2, 01, 19,
-        80, 01, 01
-}
-
-

nfc/libse-gto-hal.conf

@@ -1,2 +0,0 @@
-#Gemalto SPI devnode
-GTO_DEV=/dev/st54spi;

nfc/libse-gto-hal2.conf

@@ -1,2 +0,0 @@
-#Gemalto SPI devnode
-GTO_DEV=/dev/st33spi;

nfc/manifest_se_gs101.xml

@@ -1,7 +0,0 @@
-<manifest version="1.0" type="device">
-    <hal format="hidl">
-        <name>android.hardware.secure_element</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.2::ISecureElement/eSE1</fqname>
-    </hal>
-</manifest>

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

@@ -76,7 +76,8 @@
     <bool name="config_dozePulsePickup">true</bool>
 
     <!-- Screen brightness when dozing. -->
-    <integer name="config_screenBrightnessDoze">34</integer>
+    <integer name="config_screenBrightnessDoze">21</integer>
+    <item name="config_screenBrightnessDozeFloat" format="float" type="dimen">0.07874</item>
 
     <!-- Whether the always on display mode is available. -->
     <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
@@ -96,8 +97,10 @@
     <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
     <dimen name="rounded_corner_radius_adjustment">25px</dimen>
 
-    <!-- Height of the status bar -->
+    <!-- Height of the status bar.
-    <dimen name="status_bar_height_portrait">28dp</dimen>
+         Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
+         -->
+    <dimen name="status_bar_height">28dp</dimen>
 
     <!-- Height of area above QQS where battery/time go (equal to status bar height if > 48dp) -->
     <dimen name="quick_qs_offset_height">171px</dimen>
@@ -139,6 +142,11 @@
     <!-- Flag specifying whether WFC over IMS is availasble on device -->
     <bool name="config_device_wfc_ims_available">true</bool>
 
+    <!-- An integer representing a timeout value in milliseconds that will be used to delay a
+         radio power off command until IMS deregistration completes. If 0, this feature is disabled
+         and there will be no delay. -->
+    <integer name="config_delay_for_ims_dereg_millis">3000</integer>
+
     <!-- Whether the new Auto Selection Network UI should be shown -->
     <bool name="config_enableNewAutoSelectNetworkUI">true</bool>
 

pixelstats/service.cpp

@@ -41,6 +41,9 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
         .CodecPath = "/sys/devices/platform/audiometrics/codec_state",
         .EEPROMPath = "/dev/battery_history",
         .MitigationPath = "/sys/devices/virtual/pmic/mitigation",
+        .SpeakerTemperaturePath = "/sys/devices/platform/audiometrics/speaker_temp",
+        .SpeakerExcursionPath = "/sys/devices/platform/audiometrics/speaker_excursion",
+        .SpeakerHeartBeatPath = "/sys/devices/platform/audiometrics/speaker_heartbeat",
         .UFSErrStatsPath = {
             UFS_ERR_PATH(pa_err_count),
             UFS_ERR_PATH(dl_err_count),
@@ -51,9 +54,11 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
             UFS_ERR_PATH(auto_hibern8_err_count)
         }
 };
+
 const struct UeventListener::UeventPaths ueventPaths = {
         .AudioUevent = "/devices/virtual/amcs/amcs",
-        .WirelessChargerPtmcPath = "/sys/class/power_supply/wireless/device/ptmc_id"};
+        .WirelessChargerPtmcPath = "/sys/class/power_supply/wireless/device/ptmc_id",
+        .TypeCPartnerUevent = "PRODUCT_TYPE="};
 
 int main() {
     LOG(INFO) << "starting PixelStats";

powerhint.json

@@ -47,6 +47,7 @@
       "Values": [
         "9999999",
         "1024000",
+        "1197000",
         "1999000",
         "1491000"
       ],
@@ -69,6 +70,7 @@
       "Values": [
         "9999999",
         "984000",
+        "1426000",
         "1826000"
       ],
       "DefaultIndex": 0,
@@ -96,6 +98,14 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "DisplayWakeup",
+      "Path": "/sys/devices/platform/1c300000.drmdecon/early_wakeup",
+      "Values": [
+        "1",
+        "0"
+      ]
+    },
     {
       "Name": "CPUUtilThreshold",
       "Path": "/sys/kernel/vendor_sched/util_threshold",
@@ -120,11 +130,13 @@
       "Path": "/sys/kernel/vendor_sched/ta_uclamp_min",
       "Values": [
         "553",
+        "158",
+        "108",
+        "43",
         "1",
-        "246",
+        "157",
-        "185",
+        "107",
-        "123",
+        "42"
-        "62"
       ],
       "DefaultIndex": 1,
       "ResetOnInit": true
@@ -133,6 +145,7 @@
       "Name": "SFUClampBoost",
       "Path": "/sys/kernel/vendor_sched/sf_uclamp_min",
       "Values": [
+        "125",
         "65",
         "30"
       ],
@@ -238,14 +251,6 @@
       ],
       "ResetOnInit": true
     },
-    {
-      "Name": "DisplayWakeup",
-      "Path": "/sys/devices/platform/1c300000.drmdecon/early_wakeup",
-      "Values": [
-        "1",
-        "0"
-      ]
-    },
     {
       "Name": "LimitFlashCurrent",
       "Path": "vendor.camera.max_flash_current",
@@ -283,6 +288,15 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "GPUPowerPolicy",
+      "Path": "/sys/devices/platform/1c500000.mali/power_policy",
+      "Values": [
+        "always_on",
+        "adaptive"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "BigControlTempSet",
       "Path": "/dev/thermal/tz-by-name/BIG/trip_point_2_temp",
@@ -365,11 +379,6 @@
     }
   ],
   "Actions": [
-    {
-      "PowerHint": "INTERACTION",
-      "Type": "EndHint",
-      "Value": "DISABLE_TA_BOOST"
-    },
     {
       "PowerHint": "INTERACTION",
       "Node": "SFUClampBoost",
@@ -382,17 +391,29 @@
       "Duration": 0,
       "Value": "2"
     },
+    {
+      "PowerHint": "LAUNCH_120FPS",
+      "Node": "SFUClampBoost",
+      "Duration": 1000,
+      "Value": "125"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Type": "DoHint",
+      "Value": "LAUNCH_120FPS"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "SFUClampBoost",
+      "Duration": 5000,
+      "Value": "65"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 5000,
       "Value": "9999999"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "EndHint",
-      "Value": "DISABLE_TA_BOOST"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "CPULittleClusterMaxFreq",
@@ -411,6 +432,12 @@
       "Duration": 5000,
       "Value": "3172000"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "GPUPowerPolicy",
+      "Duration": 5000,
+      "Value": "always_on"
+    },
     {
       "PowerHint": "DISPLAY_INACTIVE",
       "Node": "F2fsRecessModeEnable",
@@ -466,23 +493,59 @@
       "Value": "4-7"
     },
     {
-      "PowerHint": "CAMERA_CPU_THROTTLE",
+      "PowerHint": "CAMERA_LAUNCH_EXTENDED",
+      "Node": "CPUBigClusterMaxFreq",
+      "Duration": 2000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "CAMERA_LAUNCH_EXTENDED",
+      "Node": "CPUMidClusterMaxFreq",
+      "Duration": 2000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "CAMERA_LAUNCH_EXTENDED",
+      "Node": "CPULittleClusterMaxFreq",
+      "Duration": 2000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 1000,
       "Value": "984000"
     },
     {
-      "PowerHint": "CAMERA_CPU_THROTTLE",
+      "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 1000,
       "Value": "1024000"
     },
     {
-      "PowerHint": "CAMERA_CPU_THROTTLE",
+      "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE",
       "Node": "CPULittleClusterMaxFreq",
       "Duration": 1000,
       "Value": "1098000"
     },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "CPUBigClusterMaxFreq",
+      "Duration": 1000,
+      "Value": "1426000"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "CPUMidClusterMaxFreq",
+      "Duration": 1000,
+      "Value": "1197000"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "CPULittleClusterMaxFreq",
+      "Duration": 1000,
+      "Value": "1401000"
+    },
     {
       "PowerHint": "CAMERA_SHOT",
       "Node": "MemFreq",
@@ -973,19 +1036,29 @@
       "PowerHint": "REFRESH_120FPS",
       "Node": "TAUClampBoost",
       "Duration": 0,
-      "Value": "185"
+      "Value": "157"
     },
     {
       "PowerHint": "REFRESH_90FPS",
       "Node": "TAUClampBoost",
       "Duration": 0,
-      "Value": "123"
+      "Value": "107"
+    },
+    {
+      "PowerHint": "REFRESH_90FPS",
+      "Type": "MaskHint",
+      "Value": "LAUNCH_120FPS"
     },
     {
       "PowerHint": "REFRESH_60FPS",
       "Node": "TAUClampBoost",
       "Duration": 0,
-      "Value": "62"
+      "Value": "42"
+    },
+    {
+      "PowerHint": "REFRESH_60FPS",
+      "Type": "MaskHint",
+      "Value": "LAUNCH_120FPS"
     },
     {
       "PowerHint": "ADPF_DISABLE_TA_BOOST",
@@ -994,15 +1067,98 @@
       "Value": "1"
     },
     {
-      "PowerHint": "DISABLE_TA_BOOST",
+      "PowerHint": "ADPF_DISABLE_TA_BOOST",
+      "Type": "MaskHint",
+      "Value": "BOOST_DISPLAY"
+    },
+    {
+      "PowerHint": "ADPF_DISABLE_TA_BOOST",
+      "Type": "EndHint",
+      "Value": "BOOST_120HZ"
+    },
+    {
+      "PowerHint": "ADPF_DISABLE_TA_BOOST",
+      "Type": "EndHint",
+      "Value": "BOOST_90HZ"
+    },
+    {
+      "PowerHint": "ADPF_DISABLE_TA_BOOST",
+      "Type": "EndHint",
+      "Value": "BOOST_60HZ"
+    },
+    {
+      "PowerHint": "BOOST_DISPLAY",
+      "Type": "DoHint",
+      "Value": "BOOST_120HZ"
+    },
+    {
+      "PowerHint": "BOOST_DISPLAY",
+      "Type": "DoHint",
+      "Value": "BOOST_90HZ"
+    },
+    {
+      "PowerHint": "BOOST_DISPLAY",
+      "Type": "DoHint",
+      "Value": "BOOST_60HZ"
+    },
+    {
+      "PowerHint": "INTERACTION",
+      "Type": "DoHint",
+      "Value": "BOOST_DISPLAY"
+    },
+    {
+      "PowerHint": "BOOST_120HZ",
       "Node": "TAUClampBoost",
-      "Duration": 0,
+      "Duration": 200,
-      "Value": "1"
+      "Value": "158"
+    },
+    {
+      "PowerHint": "BOOST_90HZ",
+      "Node": "TAUClampBoost",
+      "Duration": 200,
+      "Value": "108"
+    },
+    {
+      "PowerHint": "BOOST_60HZ",
+      "Node": "TAUClampBoost",
+      "Duration": 200,
+      "Value": "43"
+    },
+    {
+      "PowerHint": "REFRESH_120FPS",
+      "Type": "MaskHint",
+      "Value": "BOOST_60HZ"
+    },
+    {
+      "PowerHint": "REFRESH_120FPS",
+      "Type": "MaskHint",
+      "Value": "BOOST_90HZ"
+    },
+    {
+      "PowerHint": "REFRESH_90FPS",
+      "Type": "MaskHint",
+      "Value": "BOOST_60HZ"
+    },
+    {
+      "PowerHint": "REFRESH_90FPS",
+      "Type": "MaskHint",
+      "Value": "BOOST_120HZ"
+    },
+    {
+      "PowerHint": "REFRESH_60FPS",
+      "Type": "MaskHint",
+      "Value": "BOOST_90HZ"
+    },
+    {
+      "PowerHint": "REFRESH_60FPS",
+      "Type": "MaskHint",
+      "Value": "BOOST_120HZ"
     },
     {
       "PowerHint": "DISPLAY_IDLE",
-      "Type": "DoHint",
+      "Node": "TAUClampBoost",
-      "Value": "DISABLE_TA_BOOST"
+      "Duration": 0,
+      "Value": "1"
     },
     {
       "PowerHint": "DISPLAY_IDLE",
@@ -1012,12 +1168,22 @@
     {
       "PowerHint": "DISPLAY_IDLE",
       "Type": "EndHint",
-      "Value": "DISPLAY_UPDATE_IMMINENT"
+      "Value": "BOOST_120HZ"
     },
     {
-      "PowerHint": "DISPLAY_UPDATE_IMMINENT",
+      "PowerHint": "DISPLAY_IDLE",
       "Type": "EndHint",
-      "Value": "DISABLE_TA_BOOST"
+      "Value": "BOOST_90HZ"
+    },
+    {
+      "PowerHint": "DISPLAY_IDLE",
+      "Type": "EndHint",
+      "Value": "BOOST_60HZ"
+    },
+    {
+      "PowerHint": "DISPLAY_IDLE",
+      "Type": "EndHint",
+      "Value": "DISPLAY_UPDATE_IMMINENT"
     },
     {
       "PowerHint": "DISPLAY_UPDATE_IMMINENT",
@@ -1025,6 +1191,11 @@
       "Duration": 50,
       "Value": "1"
     },
+    {
+      "PowerHint": "DISPLAY_UPDATE_IMMINENT",
+      "Type": "DoHint",
+      "Value": "BOOST_DISPLAY"
+    },
     {
       "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
       "Node": "LimitFlashCurrent",

rro_overlays/EuiccSupportPixelOverlay/Android.bp

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

rro_overlays/EuiccSupportPixelOverlay/AndroidManifest.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<!-- Pixel specific EuiccSupportPixel overlays -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.euiccpixel.overlay.gs101"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay
+        android:targetPackage="com.google.euiccpixel"
+        android:isStatic="true"
+        android:priority="0"/>
+</manifest>

rro_overlays/EuiccSupportPixelOverlay/res/values/config.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources>
+    <string-array name="config_state_ready_intent_list">
+        <item>intent:#Intent;action=com.google.android.gms.dck.action.SE_STATE_CHANGED;i.com.google.android.gms.dck.extra.SE_STATE=0;end</item>
+        <item>intent:#Intent;action=com.qorvo.uwb.action.SE_STATE_CHANGED;i.com.qorvo.uwb.extra.SE_STATE=0;end</item>
+    </string-array>
+    <string-array name="config_state_busy_intent_list">
+        <item>intent:#Intent;action=com.google.android.gms.dck.action.SE_STATE_CHANGED;i.com.google.android.gms.dck.extra.SE_STATE=1;end</item>
+        <item>intent:#Intent;action=com.qorvo.uwb.action.SE_STATE_CHANGED;i.com.qorvo.uwb.extra.SE_STATE=1;end</item>
+    </string-array>
+    <string-array name="config_state_request_intent_list">
+        <item>intent:#Intent;action=com.google.android.gms.dck.action.SE_STATE_REQUEST;end</item>
+        <item>intent:#Intent;action=com.qorvo.uwb.action.SE_STATE_REQUEST;end</item>
+    </string-array>
+    <string-array name="config_state_request_permission_list">
+        <item>com.google.android.gms.dck.permission.DIGITAL_KEY_PRIVILEGED</item>
+        <item>com.qorvo.uwb.permission.SE_STATE_REQUEST</item>
+    </string-array>
+</resources>

task_profiles.json

@@ -66,6 +66,28 @@
         }
       ]
     },
+    {
+      "Name": "Dex2oatPerformance",
+      "Actions": [
+        {
+          "Name": "JoinCgroup",
+          "Params":
+          {
+            "Controller": "cpu",
+            "Path": "system"
+          }
+        },
+        {
+          "Name": "WriteFile",
+          "Params":
+          {
+            "FilePath": "/sys/kernel/vendor_sched/set_task_group_dex2oat",
+            "Value": "<pid>",
+            "LogFailures": "false"
+          }
+        }
+      ]
+    },
     {
       "Name": "CameraServiceHighCapacity",
       "Actions": [
@@ -113,7 +135,7 @@
           "Params":
           {
             "Controller": "cpu",
-            "Path": "background"
+            "Path": "system"
           }
         },
         {
@@ -309,5 +331,12 @@
         }
       ]
     }
+  ],
+
+  "AggregateProfiles": [
+    {
+      "Name": "Dex2OatBootComplete",
+      "Profiles": [ "Dex2oatPerformance", "ProcessCapacityNormal", "LowIoPriority", "TimerSlackHigh" ]
+    }
   ]
 }

usb/UsbGadget.cpp

@@ -165,6 +165,8 @@ static V1_0::Status validateAndSetVidPid(uint64_t functions) {
                 ret = setVidPid("0x04e8", "0x6862");
             } else if (vendorFunctions == "etr_miu") {
                 ret = setVidPid("0x18d1", "0x4ee2");
+            } else if (vendorFunctions == "uwb_acm"){
+                ret = setVidPid("0x18d1", "0x4ee2");
             } else {
                 if (!(vendorFunctions == "user" || vendorFunctions == "")) {
                     ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
@@ -226,9 +228,13 @@ static V1_0::Status validateAndSetVidPid(uint64_t functions) {
             ret = setVidPid("0x18d1", "0x4eeb");
             break;
         case GadgetFunction::ADB | GadgetFunction::NCM:
+            if (vendorFunctions == "dm") {
+                ret = setVidPid("0x04e8", "0x6862");
+            } else {
                 if (!(vendorFunctions == "user" || vendorFunctions == ""))
                     ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
                 ret = setVidPid("0x18d1", "0x4eec");
+            }
             break;
         default:
             ALOGE("Combination not supported");
@@ -284,6 +290,10 @@ V1_0::Status UsbGadget::setupFunctions(uint64_t functions,
         ALOGI("enable etr_miu functions");
         if (linkFunction("etr_miu.gs11", i++))
             return Status::ERROR;
+    } else if (vendorFunctions == "uwb_acm") {
+        ALOGI("enable uwb acm function");
+        if (linkFunction("acm.uwb0", i++))
+            return Status::ERROR;
     }
 
     if ((functions & GadgetFunction::ADB) != 0) {

usb/android.hardware.usb@1.3-service.gs101.rc

@@ -39,6 +39,8 @@ on property:vendor.usb.functions.ready=1
     chown system system /config/usb_gadget/g1/functions/accessory.gs2
     chown system system /config/usb_gadget/g1/functions/acm.gs6
     chown system system /config/usb_gadget/g1/functions/acm.gs6/port_num
+    chown system system /config/usb_gadget/g1/functions/acm.uwb0
+    chown system system /config/usb_gadget/g1/functions/acm.uwb0/port_num
     chown system system /config/usb_gadget/g1/functions/audio_source.gs3
     chown system system /config/usb_gadget/g1/functions/dm.gs7
     chown system system /config/usb_gadget/g1/functions/ffs.adb

uwb/calibration/UWB-calibration-am.conf

@@ -0,0 +1 @@
+restricted_channels=0xffff

uwb/calibration/UWB-calibration-ar.conf

@@ -0,0 +1 @@
+restricted_channels=0xffff

uwb/calibration/UWB-calibration-az.conf

@@ -0,0 +1 @@
+restricted_channels=0xffff

uwb/calibration/UWB-calibration-by.conf

@@ -0,0 +1 @@
+restricted_channels=0xffff

uwb/calibration/UWB-calibration-id.conf

@@ -0,0 +1 @@
+restricted_channels=0xffff

uwb/calibration/UWB-calibration-jp.conf

@@ -0,0 +1,34 @@
+ant0.ch5.prf16.tx_power=0
+ant0.ch5.prf16.pg_delay=0
+ant0.ch5.prf64.tx_power=0
+ant0.ch5.prf64.pg_delay=0
+ant0.ch9.prf16.tx_power=0x2A2A2A2A
+ant0.ch9.prf16.pg_delay=0x20
+ant0.ch9.prf64.tx_power=0x2A2A2A2A
+ant0.ch9.prf64.pg_delay=0x20
+ant1.ch5.prf16.tx_power=0
+ant1.ch5.prf16.pg_delay=0
+ant1.ch5.prf64.tx_power=0
+ant1.ch5.prf64.pg_delay=0
+ant1.ch9.prf16.tx_power=0x2A2A2A2A
+ant1.ch9.prf16.pg_delay=0x20
+ant1.ch9.prf64.tx_power=0x2A2A2A2A
+ant1.ch9.prf64.pg_delay=0x20
+ant2.ch5.prf16.tx_power=0
+ant2.ch5.prf16.pg_delay=0
+ant2.ch5.prf64.tx_power=0
+ant2.ch5.prf64.pg_delay=0
+ant2.ch9.prf16.tx_power=0x2A2A2A2A
+ant2.ch9.prf16.pg_delay=0x20
+ant2.ch9.prf64.tx_power=0x2A2A2A2A
+ant2.ch9.prf64.pg_delay=0x20
+ant3.ch5.prf16.tx_power=0
+ant3.ch5.prf16.pg_delay=0
+ant3.ch5.prf64.tx_power=0
+ant3.ch5.prf64.pg_delay=0
+ant3.ch9.prf16.tx_power=0x2A2A2A2A
+ant3.ch9.prf16.pg_delay=0x20
+ant3.ch9.prf64.tx_power=0x2A2A2A2A
+ant3.ch9.prf64.pg_delay=0x20
+alternate_pulse_shape=0x01
+restricted_channels=0x20

uwb/calibration/UWB-calibration-kg.conf

@@ -0,0 +1 @@
+restricted_channels=0xffff

uwb/calibration/UWB-calibration-kz.conf

@@ -0,0 +1 @@
+restricted_channels=0xffff

uwb/calibration/UWB-calibration-np.conf

@@ -0,0 +1 @@
+restricted_channels=0xffff

uwb/calibration/UWB-calibration-pk.conf

@@ -0,0 +1 @@
+restricted_channels=0xffff

uwb/calibration/UWB-calibration-py.conf

@@ -0,0 +1 @@
+restricted_channels=0xffff

uwb/calibration/UWB-calibration-ru.conf

@@ -0,0 +1 @@
+restricted_channels=0xffff

uwb/calibration/UWB-calibration-sb.conf

@@ -0,0 +1 @@
+restricted_channels=0xffff

uwb/calibration/UWB-calibration-tj.conf

@@ -0,0 +1 @@
+restricted_channels=0xffff

uwb/calibration/UWB-calibration-tm.conf

@@ -0,0 +1 @@
+restricted_channels=0xffff

uwb/calibration/UWB-calibration-tw.conf

@@ -0,0 +1,2 @@
+alternate_pulse_shape=0x01
+restricted_channels=0x20

uwb/calibration/UWB-calibration-ua.conf

@@ -0,0 +1 @@
+restricted_channels=0xffff

uwb/calibration/UWB-calibration-uz.conf

@@ -0,0 +1 @@
+restricted_channels=0xffff

uwb/calibration/country_conf_gen.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# This script is used to generate uwb conuntry configuration file,
+# and the PRODUCT_COPY_FILES list in uwb.mk based on uwb_country.conf
+# Bug: 196073172
+
+project=("r4" "p7")
+count=1
+
+while read line ; do
+    if [[ "$line" =~ ^"*" ]]; then
+        header=${line:1}
+    elif [[ "$line" =~ ^"\"" ]]; then
+        line=$(echo ${line/,} | tr -d "\"")
+        country[count]=$(echo $line | cut -d ':' -f1)
+        code[count]=$(echo $line | cut -d ':' -f2 | tr -d " ")
+
+            if [ "$header" = "restricted_channels=0x20" ]; then
+                echo "alternate_pulse_shape=0x01" > UWB-calibration-${code[$count]}.conf
+                echo "$header" >> UWB-calibration-${code[$count]}.conf
+            else
+            echo "$header" > UWB-calibration-${code[$count]}.conf
+            fi
+    fi
+((count++))
+done < uwb_country.conf
+
+    echo "==============  $var  =============="
+    for var2 in ${code[@]}; do
+            echo "\$(LOCAL_UWB_CAL_DIR)/UWB-calibration-$var2.conf:\$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-$var2.conf \\"
+    done

uwb/calibration/uwb_country.conf

@@ -0,0 +1,21 @@
+*restricted_channels=0xffff
+"Argentina": "ar",
+"Armenia": "am",
+"Azerbaijan": "az",
+"Belarus": "by",
+"Indonesia": "id",
+"Kazakhstan": "kz",
+"Kyrgyzstan": "kg",
+"Nepal": "np",
+"Pakistan": "pk",
+"Paraguay": "py",
+"Russia": "ru",
+"Solomon Islands": "sb",
+"Tajikistan": "tj",
+"Turkmenistanr": "tm",
+"Ukraine": "ua",
+"Uzbekistan": "uz"
+
+*restricted_channels=0x20
+"Japan": "jp",
+"Taiwan": "tw"

uwb/uwb.mk

@@ -16,3 +16,26 @@
 # UWB - ultra wide band
 $(call inherit-product-if-exists, vendor/qorvo/uwb/uwb.mk)
 
+LOCAL_UWB_CAL_DIR=device/google/gs101/uwb/calibration
+
+PRODUCT_COPY_FILES += \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-jp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-jp.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-ar.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-ar.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-am.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-am.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-az.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-az.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-by.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-by.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-id.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-id.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-kz.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-kz.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-kg.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-kg.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-np.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-np.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-pk.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-pk.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-py.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-py.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-ru.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-ru.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-sb.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-sb.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-tj.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-tj.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-tm.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-tm.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-ua.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-ua.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-uz.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-uz.conf
+
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.uwb.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/android.hardware.uwb.xml

vendor_dlkm.blocklist

@@ -1,10 +1,15 @@
 blocklist bcmdhd43752
 blocklist bcmdhd4389
+blocklist cl_dsp
 blocklist drv2624
 blocklist ftm5
+blocklist input-cs40l26-i2c
 blocklist pktgen
 blocklist sec_touch
 blocklist snd-soc-cs35l41-i2c
 blocklist snd-soc-cs35l41-spi
 blocklist st33spi
 blocklist st54spi
+blocklist uwb_desense.ko
+blocklist uwb-hal.ko
+blocklist uwbcore.ko

wifi/coex_table.xml

@@ -305,6 +305,9 @@
         <wifiVictimMhz>50</wifiVictimMhz>
         <cellVictimMhz>50</cellVictimMhz>
       </neighborThresholds>
+      <defaultChannels>
+        <default2g>11</default2g>
+      </defaultChannels>
     </params>
   </entry>
 
@@ -316,6 +319,9 @@
         <wifiVictimMhz>50</wifiVictimMhz>
         <cellVictimMhz>50</cellVictimMhz>
       </neighborThresholds>
+      <defaultChannels>
+        <default2g>11</default2g>
+      </defaultChannels>
     </params>
   </entry>
 

wifi/p2p_supplicant.conf

@@ -7,3 +7,4 @@ pmf=1
 p2p_add_cli_chan=1
 disable_scan_offload=1
 p2p_go_vht=1
+p2p_pref_chan=124:149, 115:36