Update P21 device compatibility matrix file to update uwb IUwbVendor to v2 am: 3e6a0dcd04 am: 8aab25a296
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/19801852
Change-Id: I5c6cd8e37cf578896eb00c51e01c44a364182594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/bluetooth/bluetooth.mk b/bluetooth/bluetooth.mk
deleted file mode 100644
index f203610..0000000
--- a/bluetooth/bluetooth.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-PRODUCT_PACKAGES += \
- android.hardware.bluetooth@1.1-service.bcmbtlinux
-
-BOARD_SEPOLICY_DIRS += device/google/gs101-sepolicy/bluetooth
diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index 8055fed..d88cf82 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -309,9 +309,6 @@
# Power Stats HAL
chown system system /dev/bbd_pwrstat
- # start watchdogd
- start watchdogd
-
# Add a boost for NNAPI HAL
write /proc/vendor_sched/nnapi_prefer_idle 0
write /proc/vendor_sched/nnapi_uclamp_min 512
@@ -397,7 +394,6 @@
chmod 0664 /sys/devices/platform/1c2c0000.drmdsim/hs_clock
chmod 0664 /sys/devices/platform/1c2d0000.drmdsim/hs_clock
- setprop vold.post_fs_data_done 1
setprop wifi.direct.interface p2p-dev-wlan0
setprop wifi.aware.interface aware_nmi0
@@ -719,6 +715,9 @@
swapon_all /vendor/etc/fstab.${ro.board.platform}
write /proc/sys/vm/swappiness 100
+ # Force empty CMA
+ write /sys/kernel/vendor_mm/cma/farawimg/force_empty 1
+
# Back to default VM settings
write /proc/sys/vm/dirty_expire_centisecs 3000
write /proc/sys/vm/dirty_background_ratio 10
@@ -834,12 +833,6 @@
disabled
oneshot
-# Set watchdog timer to 30 seconds and pet it every 10 seconds to get a 20 second margin
-service watchdogd /system/bin/watchdogd 10 20
- class core
- oneshot
- seclabel u:r:watchdogd:s0
-
# bugreport is triggered by holding down volume down, volume up and power
service bugreport /system/bin/dumpstate -d -p -z
class main
@@ -959,14 +952,23 @@
chown system system /dev/thermal/tz-by-name/usb_pwr_therm2/trip_point_0_temp
chown system system /dev/thermal/tz-by-name/usb_pwr_therm2/trip_point_0_hyst
chown system system /dev/thermal/tz-by-name/usb_pwr_therm2/emul_temp
+ chmod 664 /dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote
chown system system /dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote
+ chmod 664 /dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote
chown system system /dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote
+ chmod 664 /dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote
chown system system /dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote
+ chmod 664 /dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote
chown system system /dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote
+ chmod 664 /dev/thermal/cdev-by-name/tpu_cooling/user_vote
chown system system /dev/thermal/cdev-by-name/tpu_cooling/user_vote
+ chmod 664 /dev/thermal/cdev-by-name/fcc/cur_state
chown system system /dev/thermal/cdev-by-name/fcc/cur_state
+ chmod 664 /dev/thermal/cdev-by-name/dc_icl/cur_state
chown system system /dev/thermal/cdev-by-name/dc_icl/cur_state
+ chmod 664 /dev/thermal/cdev-by-name/wlc_fcc/cur_state
chown system system /dev/thermal/cdev-by-name/wlc_fcc/cur_state
+ chmod 664 /dev/thermal/cdev-by-name/usbc-port/cur_state
chown system system /dev/thermal/cdev-by-name/usbc-port/cur_state
on charger
diff --git a/device.mk b/device.mk
index a084838..4a84488 100644
--- a/device.mk
+++ b/device.mk
@@ -35,18 +35,11 @@
# Set boot SPL
BOOT_SECURITY_PATCH = $(PLATFORM_SECURITY_PATCH)
-# TODO(b/207450311): Remove this flag once implemented
-USE_PIXEL_GRALLOC := false
-ifeq ($(USE_PIXEL_GRALLOC),true)
- PRODUCT_SOONG_NAMESPACES += hardware/google/gchips/GrallocHAL
-else
- PRODUCT_SOONG_NAMESPACES += hardware/google/gchips/gralloc4
-endif
-
PRODUCT_SOONG_NAMESPACES += \
hardware/google/av \
hardware/google/gchips \
hardware/google/graphics/common \
+ hardware/google/gchips/gralloc4 \
hardware/google/graphics/gs101 \
hardware/google/interfaces \
hardware/google/pixel \
@@ -418,8 +411,8 @@
frameworks/native/data/etc/android.hardware.sensor.stepdetector.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepdetector.xml
endif
-# Add sensor HAL 2.1 product packages
-PRODUCT_PACKAGES += android.hardware.sensors@2.1-service.multihal
+# Add sensor HAL AIDL product packages
+PRODUCT_PACKAGES += android.hardware.sensors-service.multihal
# USB HAL
PRODUCT_PACKAGES += \
@@ -586,12 +579,16 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/compression_with_xor.mk)
+
+# Enable usage of io_uring in fastbootd
+PRODUCT_VENDOR_PROPERTIES += sys.usb.ffs.io_uring_enabled=true
+
# Enforce generic ramdisk allow list
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk)
# Titan-M
ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS)))
-include hardware/google/pixel/dauntless/dauntless.mk
+include device/google/gs-common/dauntless/gsc.mk
endif
# Copy Camera HFD Setfiles
@@ -864,7 +861,7 @@
# Use FUSE BPF
PRODUCT_PRODUCT_PROPERTIES += \
- ro.fuse.bpf.enabled=false
+ ro.fuse.bpf.enabled=true
# Use /product/etc/fstab.postinstall to mount system_other
PRODUCT_PRODUCT_PROPERTIES += \
@@ -1204,3 +1201,6 @@
# Call deleteAllKeys if vold detects a factory reset
PRODUCT_VENDOR_PROPERTIES += ro.crypto.metadata_init_delete_all_keys.enabled=true
+
+# Hardware Info Collection
+include hardware/google/pixel/HardwareInfo/HardwareInfo.mk
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 540e12c..a03ad1c 100644
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -266,7 +266,7 @@
{ "aoc", [this](int fd) { dumpAoCSection(fd); } },
{ "ramdump", [this](int fd) { dumpRamdumpSection(fd); } },
{ "misc", [this](int fd) { dumpMiscSection(fd); } },
- { "gsc", [this](int fd) { dumpGscSection(fd); } },
+ { "dump", [this](int fd) { dumpSection(fd); } },
{ "camera", [this](int fd) { dumpCameraSection(fd); } },
{ "trusty", [this](int fd) { dumpTrustySection(fd); } },
{ "modem", [this](int fd) { dumpModemSection(fd); } },
@@ -885,6 +885,7 @@
static void DumpF2FS(int fd) {
DumpFileToFd(fd, "F2FS", "/sys/kernel/debug/f2fs/status");
+ DumpFileToFd(fd, "F2FS", "/dev/fscklogs/fsck");
RunCommandToFd(fd, "F2FS - fsck time (ms)", {"/vendor/bin/sh", "-c", "getprop ro.boottime.init.fsck.data"});
RunCommandToFd(fd, "F2FS - checkpoint=disable time (ms)", {"/vendor/bin/sh", "-c", "getprop ro.boottime.init.mount.data"});
}
@@ -1055,11 +1056,9 @@
DumpFileToFd(fd, "VENDOR PROC DUMP", "/proc/vendor_sched/dump_task");
}
-// Dump items related to GSC
-void DumpstateDevice::dumpGscSection(int fd) {
- RunCommandToFd(fd, "Citadel VERSION", {"vendor/bin/hw/citadel_updater", "-lv"});
- RunCommandToFd(fd, "Citadel STATS", {"vendor/bin/hw/citadel_updater", "--stats"});
- RunCommandToFd(fd, "GSC DEBUG DUMP", {"vendor/bin/hw/citadel_updater", "-D"});
+// Dump scripts under vendor/bin/dump
+void DumpstateDevice::dumpSection(int fd) {
+ RunCommandToFd(fd, "dump", {"/vendor/bin/dump/dump_gsc.sh"});
}
// Dump essential camera debugging logs
diff --git a/dumpstate/DumpstateDevice.h b/dumpstate/DumpstateDevice.h
index 5cc3249..bbd523a 100644
--- a/dumpstate/DumpstateDevice.h
+++ b/dumpstate/DumpstateDevice.h
@@ -76,7 +76,7 @@
void dumpAoCSection(int fd);
void dumpRamdumpSection(int fd);
void dumpMiscSection(int fd);
- void dumpGscSection(int fd);
+ void dumpSection(int fd);
void dumpCameraSection(int fd);
void dumpTrustySection(int fd);
void dumpModemSection(int fd);
diff --git a/fingerprint/extension/fingerprint.extension.mk b/fingerprint/extension/fingerprint.extension.mk
index 96657d1..0cb220d 100644
--- a/fingerprint/extension/fingerprint.extension.mk
+++ b/fingerprint/extension/fingerprint.extension.mk
@@ -1,10 +1,14 @@
# Fingerprint extension feature
-ifneq (,$(filter userdebug, $(TARGET_BUILD_VARIANT)))
-$(call soong_config_set,fp_hal_feature,report_bug_support,true)
-BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/fingerprint-extension/vendor/
-SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/fingerprint-extension/system_ext/public/
-SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/fingerprint-extension/system_ext/private/
-PRODUCT_PACKAGES += \
- fps_ext_bug_lib \
- fingerprint.extension.sh
+ifneq (,$(filter aosp% factory%, $(TARGET_PRODUCT)))
+# Skip if device is AOSP or factory build
+else
+ ifneq (,$(filter userdebug, $(TARGET_BUILD_VARIANT)))
+ $(call soong_config_set,fp_hal_feature,report_bug_support,true)
+ BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/fingerprint-extension/vendor/
+ SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/fingerprint-extension/system_ext/public/
+ SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/fingerprint-extension/system_ext/private/
+ PRODUCT_PACKAGES += \
+ fps_ext_bug_lib \
+ fingerprint.extension.sh
+ endif
endif