Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 24Q3 to AOSP main

Browse source 
Bug: 357762254
Merged-In: Ibf7dda6c4c13d6513e2f08239c95c6b2778a98ec
Change-Id: I80bb0e53c7af5d5f5b7c342ba8b3da915a124d3c
This commit is contained in:
Xin Li 2024-09-05 17:02:37 -07:00
commit 5698c6c38e
17 changed files with 99 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

12
BoardConfig-common.mk
View file

@ -49,6 +49,11 @@ BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y
BOARD_KERNEL_CMDLINE += swiotlb=noforce BOARD_KERNEL_CMDLINE += swiotlb=noforce
BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs
# Enable KUnit for userdebug and eng builds
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
BOARD_KERNEL_CMDLINE += kunit.enable=1
endif
TARGET_NO_BOOTLOADER := true TARGET_NO_BOOTLOADER := true
TARGET_NO_RADIOIMAGE := true TARGET_NO_RADIOIMAGE := true
BOARD_PREBUILT_BOOTIMAGE := $(wildcard $(TARGET_KERNEL_DIR)/boot.img) BOARD_PREBUILT_BOOTIMAGE := $(wildcard $(TARGET_KERNEL_DIR)/boot.img)
@ -185,8 +190,8 @@ BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := \
vendor \ vendor \
vendor_dlkm vendor_dlkm
# Set error limit to BOARD_SUPER_PARTITON_SIZE - 500MB # Set error limit to BOARD_SUPER_PARTITON_SIZE - 400MB
BOARD_SUPER_PARTITION_ERROR_LIMIT := 8006926336 BOARD_SUPER_PARTITION_ERROR_LIMIT := 8111783936
# Testing related defines # Testing related defines
BOARD_PERFSETUP_SCRIPT := platform_testing/scripts/perf-setup/r4o6-setup.sh BOARD_PERFSETUP_SCRIPT := platform_testing/scripts/perf-setup/r4o6-setup.sh
@ -357,9 +362,8 @@ BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.m
BOARD_DO_NOT_STRIP_VENDOR_MODULES := true BOARD_DO_NOT_STRIP_VENDOR_MODULES := true
# Prebuilt kernel modules that are *not* listed in vendor_boot.modules.load # Prebuilt kernel modules that are *not* listed in vendor_boot.modules.load
BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES = fips140/fips140.ko BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES = fips140.ko
BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_EXTRA = $(foreach k,$(BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES),$(if $(wildcard $(KERNEL_MODULE_DIR)/$(k)), $(k))) BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_EXTRA = $(foreach k,$(BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES),$(if $(wildcard $(KERNEL_MODULE_DIR)/$(k)), $(k)))
KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_EXTRA))
# Kernel modules that are listed in vendor_boot.modules.load # Kernel modules that are listed in vendor_boot.modules.load
BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_boot.modules.load)) BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_boot.modules.load))

4
conf/init.gs101.rc
View file

@ -829,10 +829,12 @@ on property:ro.build.fingerprint=*
write /sys/module/debug_kinfo/parameters/build_info ${ro.build.fingerprint} write /sys/module/debug_kinfo/parameters/build_info ${ro.build.fingerprint}
# Bluetooth # Bluetooth
on post-fs-data on early-boot
chown bluetooth system /sys/devices/platform/175b0000.serial/serial0/serial0-0/bluetooth/hci0/rfkill0/state chown bluetooth system /sys/devices/platform/175b0000.serial/serial0/serial0-0/bluetooth/hci0/rfkill0/state
chown bluetooth system /sys/devices/platform/odm/odm:btbcm/rfkill/rfkill0/state chown bluetooth system /sys/devices/platform/odm/odm:btbcm/rfkill/rfkill0/state
chown bluetooth system /sys/devices/platform/odm/odm:btbcm/rfkill/rfkill2/state chown bluetooth system /sys/devices/platform/odm/odm:btbcm/rfkill/rfkill2/state
on post-fs-data
chown bluetooth system /proc/bluetooth/sleep/btwake chown bluetooth system /proc/bluetooth/sleep/btwake
chown bluetooth system /proc/bluetooth/sleep/lpm chown bluetooth system /proc/bluetooth/sleep/lpm
chown bluetooth system /proc/bluetooth/sleep/btwrite chown bluetooth system /proc/bluetooth/sleep/btwrite

3
default-permissions.xml
View file

@ -55,7 +55,6 @@
<!-- Camera --> <!-- Camera -->
<permission name="android.permission.CAMERA" fixed="false"/> <permission name="android.permission.CAMERA" fixed="false"/>
<!-- Camera Connectivity --> <!-- Camera Connectivity -->
<permission name="android.permission.ACCESS_FINE_LOCATION" fixed="false"/>
<permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/> <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
<permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/> <permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/>
<permission name="android.permission.BLUETOOTH_SCAN" fixed="false"/> <permission name="android.permission.BLUETOOTH_SCAN" fixed="false"/>
@ -73,6 +72,8 @@
<permission name="android.permission.ACTIVITY_RECOGNITION" fixed="false"/> <permission name="android.permission.ACTIVITY_RECOGNITION" fixed="false"/>
<!-- Notifications --> <!-- Notifications -->
<permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/> <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
<!-- Used by Bluetooth Module to collect bluetooth info -->
<permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/>
</exception> </exception>
<exception <exception

40
device.mk
View file

@ -16,7 +16,7 @@
include device/google/gs-common/device.mk include device/google/gs-common/device.mk
include device/google/gs-common/gs_watchdogd/watchdog.mk include device/google/gs-common/gs_watchdogd/watchdog.mk
include device/google/gs-common/ramdump/ramdump.mk include device/google/gs-common/ramdump_and_coredump/ramdump_and_coredump.mk
include device/google/gs-common/soc/soc.mk include device/google/gs-common/soc/soc.mk
include device/google/gs-common/soc/freq.mk include device/google/gs-common/soc/freq.mk
include device/google/gs-common/modem/modem.mk include device/google/gs-common/modem/modem.mk
@ -25,6 +25,7 @@ include device/google/gs-common/thermal/dump/thermal.mk
include device/google/gs-common/thermal/thermal_hal/device.mk include device/google/gs-common/thermal/thermal_hal/device.mk
include device/google/gs-common/pixel_metrics/pixel_metrics.mk include device/google/gs-common/pixel_metrics/pixel_metrics.mk
include device/google/gs-common/performance/perf.mk include device/google/gs-common/performance/perf.mk
include device/google/gs-common/power/power.mk
include device/google/gs-common/display/dump.mk include device/google/gs-common/display/dump.mk
include device/google/gs101/dumpstate/item.mk include device/google/gs101/dumpstate/item.mk
include device/google/gs-common/radio/dump.mk include device/google/gs-common/radio/dump.mk
@ -36,9 +37,11 @@ include device/google/gs-common/sota_app/factoryota.mk
include device/google/gs-common/misc_writer/misc_writer.mk include device/google/gs-common/misc_writer/misc_writer.mk
include device/google/gs-common/gyotaku_app/gyotaku.mk include device/google/gs-common/gyotaku_app/gyotaku.mk
include device/google/gs-common/bootctrl/bootctrl_aidl.mk include device/google/gs-common/bootctrl/bootctrl_aidl.mk
include device/google/gs-common/betterbug/betterbug.mk
ifneq ($(filter oriole raven bluejay, $(TARGET_PRODUCT)),) ifneq ($(filter oriole raven bluejay, $(TARGET_PRODUCT)),)
include device/google/gs-common/bcmbt/dump/dumplog.mk include device/google/gs-common/bcmbt/dump/dumplog.mk
endif endif
include device/google/gs-common/fingerprint/fingerprint.mk
TARGET_BOARD_PLATFORM := gs101 TARGET_BOARD_PLATFORM := gs101
DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false) DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false)
@ -179,6 +182,11 @@ PRODUCT_PROPERTY_OVERRIDES += \
telephony.active_modems.max_count=2 telephony.active_modems.max_count=2
USE_LASSEN_OEMHOOK := true USE_LASSEN_OEMHOOK := true
# The "power-anomaly-sitril" is added into PRODUCT_SOONG_NAMESPACES when
# $(USE_LASSEN_OEMHOOK) is true and $(BOARD_WITHOUT_RADIO) is not true.
ifneq ($(BOARD_WITHOUT_RADIO),true)
PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril
endif
# Use for GRIL # Use for GRIL
USES_LASSEN_MODEM := true USES_LASSEN_MODEM := true
@ -239,9 +247,8 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.vulkan.version-1_3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \ frameworks/native/data/etc/android.hardware.vulkan.version-1_3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \
frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \ frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \
frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute.xml \ frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute.xml \
frameworks/native/data/etc/android.software.contextualsearch.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.contextualsearch.xml \ frameworks/native/data/etc/android.software.vulkan.deqp.level-2024-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \
frameworks/native/data/etc/android.software.vulkan.deqp.level-2023-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \ frameworks/native/data/etc/android.software.opengles.deqp.level-2024-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml
frameworks/native/data/etc/android.software.opengles.deqp.level-2023-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml
ifeq ($(USE_SWIFTSHADER),true) ifeq ($(USE_SWIFTSHADER),true)
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
@ -509,10 +516,6 @@ PRODUCT_PACKAGES += \
com.android.future.usb.accessory com.android.future.usb.accessory
# for now include gralloc here. should come from hardware/google_devices/exynos5 # for now include gralloc here. should come from hardware/google_devices/exynos5
PRODUCT_PACKAGES += \
android.hardware.graphics.mapper@4.0-impl \
android.hardware.graphics.allocator-V1-service
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.memtrack-service.pixel \ android.hardware.memtrack-service.pixel \
libion_exynos \ libion_exynos \
@ -744,6 +747,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
debug.stagefright.c2inputsurface=-1 \ debug.stagefright.c2inputsurface=-1 \
PRODUCT_PROPERTY_OVERRIDES += media.c2.hal.selection=aidl
# 2. OpenMAX IL # 2. OpenMAX IL
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/gs101/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ device/google/gs101/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
@ -795,7 +800,9 @@ $(call inherit-product, system/core/trusty/trusty-base.mk)
include device/google/gs-common/trusty/trusty.mk include device/google/gs-common/trusty/trusty.mk
# Trusty unit test tool # Trusty unit test tool
PRODUCT_PACKAGES_DEBUG += trusty-ut-ctrl PRODUCT_PACKAGES_DEBUG += \
trusty-ut-ctrl \
tipc-test
include device/google/gs101/confirmationui/confirmationui.mk include device/google/gs101/confirmationui/confirmationui.mk
@ -820,6 +827,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.bqr.min_interval_ms=500 persist.bluetooth.bqr.min_interval_ms=500
endif endif
# Enable Bluetooth AutoOn feature
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.server.automatic_turn_on=true
#VNDK #VNDK
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
vndk-libs vndk-libs
@ -1026,7 +1037,9 @@ PRODUCT_SOONG_NAMESPACES += \
vendor/google_devices/gs101/proprietary/gchips/tpu/darwinn_logging_service \ vendor/google_devices/gs101/proprietary/gchips/tpu/darwinn_logging_service \
vendor/google_devices/gs101/proprietary/gchips/tpu/nnapi_stable_aidl \ vendor/google_devices/gs101/proprietary/gchips/tpu/nnapi_stable_aidl \
vendor/google_devices/gs101/proprietary/gchips/tpu/aidl \ vendor/google_devices/gs101/proprietary/gchips/tpu/aidl \
vendor/google_devices/gs101/proprietary/gchips/tpu/hal vendor/google_devices/gs101/proprietary/gchips/tpu/hal \
vendor/google_devices/gs101/proprietary/gchips/tpu/tachyon/api \
vendor/google_devices/gs101/proprietary/gchips/tpu/tachyon/service
# TPU firmware # TPU firmware
PRODUCT_PACKAGES += edgetpu-abrolhos.fw PRODUCT_PACKAGES += edgetpu-abrolhos.fw
@ -1119,3 +1132,10 @@ include hardware/google/pixel/HardwareInfo/HardwareInfo.mk
# Touch service # Touch service
include device/google/gs-common/touch/twoshay/aidl_gs101.mk include device/google/gs-common/touch/twoshay/aidl_gs101.mk
include device/google/gs-common/touch/twoshay/twoshay.mk
# Allow longer timeout for incident report generation in bugreport
# Overriding in /product partition instead of /vendor intentionally,
# since it can't be overridden from /vendor.
PRODUCT_PRODUCT_PROPERTIES += \
dumpstate.strict_run=false

2
device_framework_matrix_product.xml
View file

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

20
manifest_media.xml
View file

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

5
manifest_media_aosp.xml
View file

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

10
media_codecs_aosp_c2.xml
View file

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

4
media_codecs_bo_c2.xml
View file

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

18
media_codecs_performance_c2.xml
View file

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

4
overlay/frameworks/base/core/res/res/values/config.xml
View file

@ -237,8 +237,8 @@
<!-- Should the pinner service pin the Camera application? --> <!-- Should the pinner service pin the Camera application? -->
<bool name="config_pinnerCameraApp">true</bool> <bool name="config_pinnerCameraApp">true</bool>
<!-- Should the pinner service pin the Home application? --> <!-- Bytes that the PinnerService will pin for Home app -->
<bool name="config_pinnerHomeApp">true</bool> <integer name="config_pinnerHomePinBytes">6291456</integer>
<!-- Bytes that the PinnerService will pin for WebView --> <!-- Bytes that the PinnerService will pin for WebView -->
<integer name="config_pinnerWebviewPinBytes">20971520</integer> <integer name="config_pinnerWebviewPinBytes">20971520</integer>

17
pixelstats/service.cpp
View file

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

6
rro_overlays/WifiOverlay/res/values/config.xml
View file

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

2
telephony/pktrouter.mk
View file

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

1
usb/usb/Android.bp
View file

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

5
usb/usb/Usb.cpp
View file

@ -593,6 +593,11 @@ ScopedAStatus Usb::switchRole(const string& in_portName, const PortRole& in_role
fp = fopen(filename.c_str(), "w"); fp = fopen(filename.c_str(), "w");
if (fp != NULL) { if (fp != NULL) {
int ret = fputs(convertRoletoString(in_role).c_str(), fp); int ret = fputs(convertRoletoString(in_role).c_str(), fp);
if (ret == EAGAIN) {
ALOGI("role switch busy, retry in %d ms", ROLE_SWAP_RETRY_MS);
std::this_thread::sleep_for(std::chrono::milliseconds(ROLE_SWAP_RETRY_MS));
ret = fputs(convertRoletoString(in_role).c_str(), fp);
}
fclose(fp); fclose(fp);
if ((ret != EOF) && ReadFileToString(filename, &written)) { if ((ret != EOF) && ReadFileToString(filename, &written)) {
written = Trim(written); written = Trim(written);

2
usb/usb/Usb.h
View file

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