From 03660e700c07a6e71320c5dcf9b40cfed94166e4 Mon Sep 17 00:00:00 2001 From: Mahesh Kallelil Date: Thu, 7 Dec 2023 12:21:14 -0800 Subject: [PATCH 1/2] modem: Enable VoLTE with MIF off by default Bug: 315354048 Test: Tested build on device Change-Id: I1ce77e91ae7242f209b175d86f1822be38900938 Signed-off-by: Mahesh Kallelil --- device-husky.mk | 3 +++ device-shiba.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index c098901..3f0c0d0 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -307,6 +307,9 @@ PRODUCT_VENDOR_PROPERTIES += \ # Media Performance Class 14 PRODUCT_PRODUCT_PROPERTIES += ro.odm.build.media_performance_class=34 +# Modem +PRODUCT_PROPERTY_OVERRIDES += persist.vendor.radio.volte_mif_off=true + # config of display brightness dimming PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.0.brightness.dimming.usage?=1 PRODUCT_VENDOR_PROPERTIES += \ diff --git a/device-shiba.mk b/device-shiba.mk index 55caef5..fab093a 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -305,6 +305,9 @@ PRODUCT_VENDOR_PROPERTIES += \ # Media Performance Class 14 PRODUCT_PRODUCT_PROPERTIES += ro.odm.build.media_performance_class=34 +# Modem +PRODUCT_PROPERTY_OVERRIDES += persist.vendor.radio.volte_mif_off=true + # Display LBE PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 From 87b8b4e7570bcfe208ed658d054c89fc9616e113 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Wed, 13 Dec 2023 17:13:39 +0800 Subject: [PATCH 2/2] Branch bootloader prebuilts for 24Q2 release Bug: 313350495 Change-Id: I78ffa902088929a4422bab1a5dbea6534c18b99d --- device-husky.mk | 4 ++++ device-ripcurrent.mk | 2 ++ device-shiba.mk | 4 ++++ husky/BoardConfig.mk | 2 ++ ripcurrent/BoardConfig.mk | 2 ++ shiba/BoardConfig.mk | 2 ++ 6 files changed, 16 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index 14b3e07..1e9db2e 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -259,6 +259,8 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk endif @@ -294,6 +296,8 @@ PRODUCT_VENDOR_PROPERTIES += \ # Fingerprint HAL ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q2 else APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk endif diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index 31f2212..0717be5 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -217,6 +217,8 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk endif diff --git a/device-shiba.mk b/device-shiba.mk index 0ff9dbb..c846689 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -246,6 +246,8 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk endif @@ -277,6 +279,8 @@ PRODUCT_VENDOR_PROPERTIES += \ # Fingerprint HAL ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q2 else APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk endif diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk index 11f0b58..0f5e382 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -29,6 +29,8 @@ RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR) RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk endif diff --git a/ripcurrent/BoardConfig.mk b/ripcurrent/BoardConfig.mk index 8f23294..d25edd1 100644 --- a/ripcurrent/BoardConfig.mk +++ b/ripcurrent/BoardConfig.mk @@ -29,6 +29,8 @@ USES_DEVICE_GOOGLE_SHUSKY := true ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk endif diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk index fea737f..4ae6c8b 100644 --- a/shiba/BoardConfig.mk +++ b/shiba/BoardConfig.mk @@ -29,6 +29,8 @@ RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR) RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk endif