diff --git a/USI_Stylus.idc b/USI_Stylus.idc new file mode 100644 index 0000000..58d8d2c --- /dev/null +++ b/USI_Stylus.idc @@ -0,0 +1,4 @@ +touch.orientationAware = 1 +touch.orientation = ORIENTATION_0 +touch.usiVersionMajor = 2 +touch.usiVersionMinor = 0 diff --git a/audio/tangorpro/aidl_config/mixer_paths_aidl.xml b/audio/tangorpro/aidl_config/mixer_paths_aidl.xml index d89f751..e15a243 100644 --- a/audio/tangorpro/aidl_config/mixer_paths_aidl.xml +++ b/audio/tangorpro/aidl_config/mixer_paths_aidl.xml @@ -1410,7 +1410,7 @@ - + @@ -1420,6 +1420,14 @@ + + + + + + + + diff --git a/audio/tangorpro/config/audio_platform_configuration.xml b/audio/tangorpro/config/audio_platform_configuration.xml index 959b4c5..8271a90 100644 --- a/audio/tangorpro/config/audio_platform_configuration.xml +++ b/audio/tangorpro/config/audio_platform_configuration.xml @@ -254,6 +254,7 @@ + @@ -292,6 +293,7 @@ + @@ -312,6 +314,7 @@ + diff --git a/audio/tangorpro/config/audio_policy_configuration.xml b/audio/tangorpro/config/audio_policy_configuration.xml index 7378357..2d1b259 100644 --- a/audio/tangorpro/config/audio_policy_configuration.xml +++ b/audio/tangorpro/config/audio_policy_configuration.xml @@ -136,10 +136,6 @@ - - - - @@ -152,8 +148,6 @@ - - @@ -161,8 +155,6 @@ - - - - - - @@ -152,8 +148,6 @@ - - @@ -161,8 +155,6 @@ - - diff --git a/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 47b581c..a510290 100644 --- a/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -132,10 +132,6 @@ - - - - @@ -146,8 +142,6 @@ - - @@ -155,8 +149,6 @@ - - diff --git a/audio/tangorpro/prebuilt/libspeechenhancer/arm32/libspeechenhancer.so b/audio/tangorpro/prebuilt/libspeechenhancer/arm32/libspeechenhancer.so index 34906bf..74d302d 100644 Binary files a/audio/tangorpro/prebuilt/libspeechenhancer/arm32/libspeechenhancer.so and b/audio/tangorpro/prebuilt/libspeechenhancer/arm32/libspeechenhancer.so differ diff --git a/audio/tangorpro/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so b/audio/tangorpro/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so index b3afa18..173d82a 100644 Binary files a/audio/tangorpro/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so and b/audio/tangorpro/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so differ diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 1584fba..2dcc4bc 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -14,18 +14,12 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/tangorpro-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/tangorpro-kernel/kernel-headers TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_LEFT -ifdef RELEASE_GOOGLE_TANGORPRO_KERNEL_VERSION -TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_TANGORPRO_KERNEL_VERSION) -endif - -ifdef RELEASE_GOOGLE_TANGORPRO_KERNEL_DIR -TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_TANGORPRO_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_TANGORPRO_KERNEL_DIR)/kernel-headers -endif +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_TANGORPRO_VERSION) +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_TANGORPRO_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_TANGORPRO_DIR)/kernel-headers BOARD_WITHOUT_RADIO := true @@ -82,7 +76,8 @@ PRODUCT_DEXPREOPT_SPEED_APPS += SystemUITitan # For tablet # Touch files PRODUCT_COPY_FILES += \ device/google/tangorpro/NVTCapacitiveTouchScreen.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/NVTCapacitiveTouchScreen.idc \ - device/google/tangorpro/NVTCapacitivePen.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/NVTCapacitivePen.idc + device/google/tangorpro/NVTCapacitivePen.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/NVTCapacitivePen.idc \ + device/google/tangorpro/USI_Stylus.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/USI_Stylus.idc # Init files PRODUCT_COPY_FILES += \ @@ -132,6 +127,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.opus.enabled=true +# Enable Bluetooth AutoOn feature +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.server.automatic_turn_on=true + # Keymaster HAL #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service @@ -171,13 +170,6 @@ include device/google/tangorpro/fingerprint_config.mk # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/24Q2 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/trunk -endif # Wifi SAP Interface Name PRODUCT_PROPERTY_OVERRIDES += \ @@ -283,7 +275,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.camera.adjust_backend_min_freq_for_1p_front_video_1080p_30fps=1 \ persist.vendor.camera.bypass_sensor_binning_resolution_condition=1 \ persist.vendor.camera.extended_launch_boost=1 \ - persist.vendor.camera.raise_buf_allocation_priority=1 + persist.vendor.camera.raise_buf_allocation_priority=1 \ + camera.enable_landscape_to_portrait=true # Enable camera exif model/make reporting PRODUCT_VENDOR_PROPERTIES += \ diff --git a/powerhint.json b/powerhint.json index 45d5de6..79e1c35 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1881,16 +1881,27 @@ "PID_Du": 0.0, "UclampMin_On": true, "UclampMin_Init": 182, + "UclampMin_LoadUp": 514, + "UclampMin_LoadReset": 514, "UclampMin_High": 514, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "UiHighBoostWithoutPid", @@ -1910,9 +1921,9 @@ "UclampMin_Init": 250, "UclampMin_High": 197, "UclampMin_Low": 197, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -1934,9 +1945,9 @@ "UclampMin_Init": 250, "UclampMin_High": 53, "UclampMin_Low": 53, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -1958,9 +1969,9 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 } diff --git a/rro_overlays/UwbOverlay/res/values/config.xml b/rro_overlays/UwbOverlay/res/values/config.xml index fcbfa5f..15cfbf4 100644 --- a/rro_overlays/UwbOverlay/res/values/config.xml +++ b/rro_overlays/UwbOverlay/res/values/config.xml @@ -63,4 +63,10 @@ This works best with an FOV primer setting below 90 degrees to ensure that predictions are being used across the 90-degree threshold. --> false + + + true diff --git a/tangorpro/BoardConfig.mk b/tangorpro/BoardConfig.mk index ec39627..0a83b85 100644 --- a/tangorpro/BoardConfig.mk +++ b/tangorpro/BoardConfig.mk @@ -15,18 +15,15 @@ # TARGET_BOARD_INFO_FILE := device/google/tangorpro/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := tangorpro -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 -else -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk -endif +RELEASE_GOOGLE_BOOTLOADER_TANGORPRO_DIR ?= pdk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_TANGORPRO_DIR) +$(call soong_config_set,tangorpro_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_TANGORPRO_DIR)) # Enable load module in parallel BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true # The modules which need to be loaded in sequential +BOARD_KERNEL_CMDLINE += fips140.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 ifdef PHONE_CAR_BOARD_PRODUCT diff --git a/thermal_info_config_tangorpro.json b/thermal_info_config_tangorpro.json index 1aa4981..5260a34 100644 --- a/thermal_info_config_tangorpro.json +++ b/thermal_info_config_tangorpro.json @@ -630,38 +630,6 @@ "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true - }, - { - "Name":"soft_ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8500, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true } ], "CoolingDevices":[