diff options
| author | Xin Li <delphij@google.com> | 2024-09-05 17:02:38 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2024-09-05 17:02:38 -0700 |
| commit | 99e23764ed4d96b07890827b34b01ef4762779be (patch) | |
| tree | 119fd7f72f5039c07884775f6a97d2680dfde687 | |
| parent | 56d82ea74ff6c10309689cf0d4b2621a8ad0e79f (diff) | |
| parent | 613ff5a127c519cf4307970d3526dc0d53a558f7 (diff) | |
Merge 24Q3 to AOSP main
Bug: 357762254
Merged-In: I2861e1c4b67333c528d65678bb3c33d75b569e70
Change-Id: I679a284403c79d6b72b03f135ec0ef49f25a9600
| -rw-r--r-- | BoardConfig-common.mk | 4 | ||||
| -rw-r--r-- | device-common.mk | 13 | ||||
| -rwxr-xr-x | overlay/frameworks/base/core/res/res/values/config.xml | 4 |
3 files changed, 17 insertions, 4 deletions
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 42271d90..17dc8520 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -501,8 +501,8 @@ ifneq ($(PRODUCT_BUILD_VENDOR_IMAGE),false) BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST += vendor endif -#BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE is set to (5GB - 4MB) -BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 5364514816 +#BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE is set to (6GB - 4MB) +BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 6438256640 # Set error limit to BOARD_SUPER_PARTITON_SIZE - 500MB BOARD_SUPER_PARTITION_ERROR_LIMIT := 9231663104 diff --git a/device-common.mk b/device-common.mk index 2ee55bb6..d78adb0c 100644 --- a/device-common.mk +++ b/device-common.mk @@ -34,6 +34,7 @@ PRODUCT_SOONG_NAMESPACES += \ vendor/google/camera \ vendor/qcom/sm7250 \ vendor/google/interfaces \ + vendor/google/tools/power-anomaly-qcril \ vendor/google_devices/common/proprietary/confirmatioui_hal \ vendor/google_nos/host/android \ vendor/google_nos/test/system-test-harness @@ -90,6 +91,12 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PACKAGES += \ messaging \ +# ramdump_app +PRODUCT_PACKAGES_DEBUG += RamdumpUploader + +# ssr_detector_app +PRODUCT_PACKAGES += SSRestartDetector + TARGET_PRODUCT_PROP := $(LOCAL_PATH)/product.prop $(call inherit-product, $(LOCAL_PATH)/utils.mk) @@ -1043,4 +1050,10 @@ include device/google/gs-common/thermal/thermal_hal/device.mk # Pixel Logger include hardware/google/pixel/PixelLogger/PixelLogger.mk + +# Touch service +include device/google/gs-common/touch/twoshay/twoshay.mk ################################################################################# + +# Update soong config namespace +-include vendor/google/build/soong/soong_config_namespace/qcril_oemhook.mk diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 75badc87..b0747c0d 100755 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -287,8 +287,8 @@ <!-- Should the pinner service pin the Camera application? --> <bool name="config_pinnerCameraApp">true</bool> - <!-- Should the pinner service pin the Home application? --> - <bool name="config_pinnerHomeApp">true</bool> + <!-- Bytes that the PinnerService will pin for Home app --> + <integer name="config_pinnerHomePinBytes">6291456</integer> <!-- True if Unprocessed audio source supports the required frequency range and level --> <bool name="config_supportAudioSourceUnprocessed">true</bool> |