diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 293cb45..0000000 --- a/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright (C) 2011 The Android Open-Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# WARNING: Everything listed here will be built on ALL platforms, -# including x86, the universal, and the SDK. Modules must be uniquely -# named (liblights.panda), and must build everywhere, or limit themselves -# to only building on ARM if they include assembly. Individual makefiles -# are responsible for having their own logic, for fine-grained control. - -LOCAL_PATH := $(call my-dir) - -# if some modules are built directly from this directory (not subdirectories), -# their rules should be written here. - -ifneq (,$(filter $(TARGET_DEVICE),ripcurrent husky shiba)) - include $(call all-makefiles-under,$(LOCAL_PATH)) -endif diff --git a/audio/husky/aidl_config/audio_platform_configuration.xml b/audio/husky/aidl_config/audio_platform_configuration.xml index 1e775b2..4b747bb 100644 --- a/audio/husky/aidl_config/audio_platform_configuration.xml +++ b/audio/husky/aidl_config/audio_platform_configuration.xml @@ -23,10 +23,11 @@ - + + diff --git a/audio/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml index d22b97c..9aa0c88 100644 --- a/audio/husky/aidl_config/mixer_paths_aidl.xml +++ b/audio/husky/aidl_config/mixer_paths_aidl.xml @@ -425,6 +425,10 @@ + + + + @@ -493,6 +497,10 @@ + + + + @@ -561,6 +569,10 @@ + + + + @@ -634,6 +646,10 @@ + + + + @@ -702,6 +718,10 @@ + + + + @@ -782,6 +802,10 @@ + + + + @@ -818,6 +842,14 @@ + + + + + + + + @@ -830,6 +862,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -901,6 +985,10 @@ + + + + @@ -986,14 +1074,11 @@ - - + - - + - - + @@ -1092,6 +1177,10 @@ + + + + @@ -1104,6 +1193,10 @@ + + + + @@ -1116,6 +1209,10 @@ + + + + @@ -1167,7 +1264,6 @@ - @@ -1396,8 +1492,8 @@ - - + + diff --git a/audio/husky/audio-tables.mk b/audio/husky/audio-tables.mk index e1b429a..1506b4e 100644 --- a/audio/husky/audio-tables.mk +++ b/audio/husky/audio-tables.mk @@ -17,7 +17,7 @@ AUDIO_TABLE_FOLDER := husky # Choose AIDL config by build flag. -ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true) +ifeq ($(USE_AUDIO_HAL_AIDL),true) PRODUCT_SOONG_NAMESPACES += device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config PRODUCT_PACKAGES += audio_aidl_configs @@ -31,7 +31,7 @@ PRODUCT_COPY_FILES += \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ - frameworks/av/services/audiopolicy/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ diff --git a/audio/husky/config/audio_platform_configuration.xml b/audio/husky/config/audio_platform_configuration.xml index 86e910b..60f0be3 100644 --- a/audio/husky/config/audio_platform_configuration.xml +++ b/audio/husky/config/audio_platform_configuration.xml @@ -308,6 +308,7 @@ + diff --git a/audio/husky/config/audio_policy_configuration.xml b/audio/husky/config/audio_policy_configuration.xml index a9120dd..ac241e4 100644 --- a/audio/husky/config/audio_policy_configuration.xml +++ b/audio/husky/config/audio_policy_configuration.xml @@ -97,7 +97,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml index d0dbd1e..7175981 100644 --- a/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -97,7 +97,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 5c5602c..0755fec 100644 --- a/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -90,7 +90,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml b/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml index 82b3017..bfd76a7 100644 --- a/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml @@ -97,7 +97,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/shiba/aidl_config/audio_platform_configuration.xml b/audio/shiba/aidl_config/audio_platform_configuration.xml index 1e775b2..4b747bb 100644 --- a/audio/shiba/aidl_config/audio_platform_configuration.xml +++ b/audio/shiba/aidl_config/audio_platform_configuration.xml @@ -23,10 +23,11 @@ - + + diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml index d22b97c..9aa0c88 100644 --- a/audio/shiba/aidl_config/mixer_paths_aidl.xml +++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml @@ -425,6 +425,10 @@ + + + + @@ -493,6 +497,10 @@ + + + + @@ -561,6 +569,10 @@ + + + + @@ -634,6 +646,10 @@ + + + + @@ -702,6 +718,10 @@ + + + + @@ -782,6 +802,10 @@ + + + + @@ -818,6 +842,14 @@ + + + + + + + + @@ -830,6 +862,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -901,6 +985,10 @@ + + + + @@ -986,14 +1074,11 @@ - - + - - + - - + @@ -1092,6 +1177,10 @@ + + + + @@ -1104,6 +1193,10 @@ + + + + @@ -1116,6 +1209,10 @@ + + + + @@ -1167,7 +1264,6 @@ - @@ -1396,8 +1492,8 @@ - - + + diff --git a/audio/shiba/audio-tables.mk b/audio/shiba/audio-tables.mk index b5e8045..dd809ee 100644 --- a/audio/shiba/audio-tables.mk +++ b/audio/shiba/audio-tables.mk @@ -17,7 +17,7 @@ AUDIO_TABLE_FOLDER := shiba # Choose AIDL config by build flag. -ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true) +ifeq ($(USE_AUDIO_HAL_AIDL),true) PRODUCT_SOONG_NAMESPACES += device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config PRODUCT_PACKAGES += audio_aidl_configs @@ -31,7 +31,7 @@ PRODUCT_COPY_FILES += \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ - frameworks/av/services/audiopolicy/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ diff --git a/audio/shiba/config/audio_platform_configuration.xml b/audio/shiba/config/audio_platform_configuration.xml index 86e910b..60f0be3 100644 --- a/audio/shiba/config/audio_platform_configuration.xml +++ b/audio/shiba/config/audio_platform_configuration.xml @@ -308,6 +308,7 @@ + diff --git a/audio/shiba/config/audio_policy_configuration.xml b/audio/shiba/config/audio_policy_configuration.xml index a9120dd..9c8f2f9 100644 --- a/audio/shiba/config/audio_policy_configuration.xml +++ b/audio/shiba/config/audio_policy_configuration.xml @@ -97,7 +97,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml index d0dbd1e..7175981 100644 --- a/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -97,7 +97,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 5c5602c..0755fec 100644 --- a/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -90,7 +90,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml b/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml index 82b3017..0f6f636 100644 --- a/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml @@ -97,7 +97,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/device-husky.mk b/device-husky.mk index 18d24b9..3008bbd 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -20,6 +20,15 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) TARGET_KERNEL_DIR ?= device/google/shusky-kernel TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers +ifdef RELEASE_GOOGLE_HUSKY_KERNEL_VERSION +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_HUSKY_KERNEL_VERSION) +endif + +ifdef RELEASE_GOOGLE_HUSKY_KERNEL_DIR +TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)/kernel-headers +endif + LOCAL_PATH := device/google/shusky ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) @@ -44,12 +53,17 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layer PRODUCT_COPY_FILES += \ device/google/shusky/husky/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb \ - device/google/shusky/husky/display_golden_google-hk3_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_google-hk3_cal0.pb + device/google/shusky/husky/display_golden_google-hk3_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_google-hk3_cal0.pb \ + device/google/shusky/display_golden_external_display_cal2.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_external_display_cal2.pb CAMERA_PRODUCT ?= husky -include device/google/shusky/audio/husky/audio-tables.mk +ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA),true) +USE_AUDIO_HAL_AIDL := true +endif + include device/google/shusky/camera/camera.mk +include device/google/shusky/audio/husky/audio-tables.mk include device/google/zuma/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk @@ -125,6 +139,11 @@ PRODUCT_PACKAGES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true +# Sound Dose +PRODUCT_PACKAGES += \ + android.hardware.audio.sounddose-vendor-impl \ + audio_sounddose_aoc + # Audio CCA property PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.audio.cca.enabled=false @@ -180,13 +199,19 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Bluetooth LE Audio PRODUCT_PRODUCT_PROPERTIES += \ - ro.bluetooth.leaudio_switcher.supported=true \ - bluetooth.profile.bap.unicast.client.enabled=true \ - bluetooth.profile.csip.set_coordinator.enabled=true \ - bluetooth.profile.hap.client.enabled=true \ - bluetooth.profile.mcp.server.enabled=true \ - bluetooth.profile.ccp.server.enabled=true \ - bluetooth.profile.vcp.controller.enabled=true + ro.bluetooth.leaudio_switcher.supported?=true \ + bluetooth.profile.bap.unicast.client.enabled?=true \ + bluetooth.profile.csip.set_coordinator.enabled?=true \ + bluetooth.profile.hap.client.enabled?=true \ + bluetooth.profile.mcp.server.enabled?=true \ + bluetooth.profile.ccp.server.enabled?=true \ + bluetooth.profile.vcp.controller.enabled?=true + +ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true) +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.profile.bap.broadcast.assist.enabled=true \ + bluetooth.profile.bap.broadcast.source.enabled=true +endif # Bluetooth LE Audio enable hardware offloading PRODUCT_PRODUCT_PROPERTIES += \ @@ -199,7 +224,7 @@ PRODUCT_COPY_FILES += \ # LE Audio Unicast Allowlist PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.leaudio.allow_list=SM-R510 + persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5 # Bluetooth LE Audio CIS handover to SCO # Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683. @@ -259,7 +284,7 @@ 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))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk @@ -296,7 +321,7 @@ 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))) +else ifneq (,$(filter AP2% AP3%,$(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 @@ -324,9 +349,6 @@ 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 += \ @@ -378,7 +400,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=13 + ro.vendor.build.svn=19 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) @@ -440,4 +462,12 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_PACKAGES += \ NfcOverlayHusky \ +# Set support hide display cutout feature +PRODUCT_PRODUCT_PROPERTIES += \ + ro.support_hide_display_cutout=true + +PRODUCT_PACKAGES += \ + NoCutoutOverlay \ + AvoidAppsInCutoutOverlay + PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index 0717be5..f4b6590 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -20,6 +20,15 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) TARGET_KERNEL_DIR ?= device/google/shusky-kernel TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers +ifdef RELEASE_GOOGLE_RIPCURRENT_KERNEL_VERSION +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_VERSION) +endif + +ifdef RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR +TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR)/kernel-headers +endif + ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) USE_UWBFIELDTESTQM := true endif @@ -99,7 +108,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ - ro.gms.dck.eligible_wcc=3 + ro.gms.dck.eligible_wcc=3 \ + ro.gms.dck.se_capability=1 # Bluetooth hci_inject test tool PRODUCT_PACKAGES_DEBUG += \ @@ -157,6 +167,12 @@ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.profile.ccp.server.enabled=true \ bluetooth.profile.vcp.controller.enabled=true +ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true) +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.profile.bap.broadcast.assist.enabled=true \ + bluetooth.profile.bap.broadcast.source.enabled=true +endif + # Bluetooth LE Audio enable hardware offloading PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.leaudio_offload.supported=true \ @@ -217,7 +233,7 @@ 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))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk diff --git a/device-shiba.mk b/device-shiba.mk index e3e0679..dd950d2 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -20,6 +20,15 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) TARGET_KERNEL_DIR ?= device/google/shusky-kernel TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers +ifdef RELEASE_GOOGLE_SHIBA_KERNEL_VERSION +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_SHIBA_KERNEL_VERSION) +endif + +ifdef RELEASE_GOOGLE_SHIBA_KERNEL_DIR +TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)/kernel-headers +endif + LOCAL_PATH := device/google/shusky $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-shiba.mk) @@ -32,8 +41,12 @@ $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/Wallp DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay CAMERA_PRODUCT ?= shiba -include device/google/shusky/audio/shiba/audio-tables.mk +ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA),true) +USE_AUDIO_HAL_AIDL := true +endif + include device/google/shusky/camera/camera.mk +include device/google/shusky/audio/shiba/audio-tables.mk include device/google/zuma/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk @@ -113,6 +126,11 @@ PRODUCT_PACKAGES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true +# Sound Dose +PRODUCT_PACKAGES += \ + android.hardware.audio.sounddose-vendor-impl \ + audio_sounddose_aoc + # Audio CCA property PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.audio.cca.enabled=false @@ -168,13 +186,19 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Bluetooth LE Audio PRODUCT_PRODUCT_PROPERTIES += \ - ro.bluetooth.leaudio_switcher.supported=true \ - bluetooth.profile.bap.unicast.client.enabled=true \ - bluetooth.profile.csip.set_coordinator.enabled=true \ - bluetooth.profile.hap.client.enabled=true \ - bluetooth.profile.mcp.server.enabled=true \ - bluetooth.profile.ccp.server.enabled=true \ - bluetooth.profile.vcp.controller.enabled=true + ro.bluetooth.leaudio_switcher.supported?=true \ + bluetooth.profile.bap.unicast.client.enabled?=true \ + bluetooth.profile.csip.set_coordinator.enabled?=true \ + bluetooth.profile.hap.client.enabled?=true \ + bluetooth.profile.mcp.server.enabled?=true \ + bluetooth.profile.ccp.server.enabled?=true \ + bluetooth.profile.vcp.controller.enabled?=true + +ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true) +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.profile.bap.broadcast.assist.enabled=true \ + bluetooth.profile.bap.broadcast.source.enabled=true +endif # Bluetooth LE Audio enable hardware offloading PRODUCT_PRODUCT_PROPERTIES += \ @@ -187,7 +211,7 @@ PRODUCT_COPY_FILES += \ # LE Audio Unicast Allowlist PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.leaudio.allow_list=SM-R510 + persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5 # Bluetooth LE Audio CIS handover to SCO # Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683. @@ -246,7 +270,7 @@ 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))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk @@ -279,7 +303,7 @@ 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))) +else ifneq (,$(filter AP2% AP3%,$(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 @@ -315,7 +339,8 @@ PRODUCT_COPY_FILES += \ device/google/shusky/shiba/display_colordata_google-bigsurf_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_google-bigsurf_cal0.pb \ device/google/shusky/shiba/display_colordata_google-shoreline_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_google-shoreline_cal0.pb \ device/google/shusky/shiba/display_golden_google-bigsurf_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_google-bigsurf_cal0.pb \ - device/google/shusky/shiba/display_golden_google-shoreline_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_google-shoreline_cal0.pb + device/google/shusky/shiba/display_golden_google-shoreline_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_google-shoreline_cal0.pb \ + device/google/shusky/display_golden_external_display_cal2.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_external_display_cal2.pb # Camera Vendor property PRODUCT_VENDOR_PROPERTIES += \ @@ -324,9 +349,6 @@ 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 @@ -352,7 +374,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=13 + ro.vendor.build.svn=19 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ @@ -406,4 +428,12 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_PACKAGES += \ NfcOverlayShiba +# Set support hide display cutout feature +PRODUCT_PRODUCT_PROPERTIES += \ + ro.support_hide_display_cutout=true + +PRODUCT_PACKAGES += \ + NoCutoutOverlay \ + AvoidAppsInCutoutOverlay + PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true diff --git a/display_golden_external_display_cal2.pb b/display_golden_external_display_cal2.pb new file mode 100644 index 0000000..a5e604b Binary files /dev/null and b/display_golden_external_display_cal2.pb differ diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk index 0f5e382..cef3db2 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -29,7 +29,7 @@ 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))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk diff --git a/husky/overlay/frameworks/base/core/res/res/values/config.xml b/husky/overlay/frameworks/base/core/res/res/values/config.xml index f03519a..c37151b 100644 --- a/husky/overlay/frameworks/base/core/res/res/values/config.xml +++ b/husky/overlay/frameworks/base/core/res/res/values/config.xml @@ -289,6 +289,8 @@ http://www.gstatic.com/android/sms/G1MNW.xml + true + 0.335 diff --git a/husky/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/husky/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml index 6a1cb5a..0e42fa6 100644 --- a/husky/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml +++ b/husky/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -26,7 +26,7 @@ Cellular_data - + Sound_trigger diff --git a/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index 8cec238..0caa995 100644 --- a/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -28,4 +28,7 @@ 57px 19px + + + 51.9 diff --git a/husky/rro_overlays/NfcOverlay/res/values/config.xml b/husky/rro_overlays/NfcOverlay/res/values/config.xml index 20edf75..f396738 100644 --- a/husky/rro_overlays/NfcOverlay/res/values/config.xml +++ b/husky/rro_overlays/NfcOverlay/res/values/config.xml @@ -32,4 +32,5 @@ 103 + true diff --git a/location/gps.cer b/location/gps.cer index 934e0c5..eab842b 100644 --- a/location/gps.cer +++ b/location/gps.cer @@ -159,3 +159,17 @@ Op9P1ZW2kjqv5D2+q/qtaePAyHn3B05UZrQYUmx7LaHNO7op6dZgCdoR0sVsR+Fc Zyr0AhgiuTWrjtUEOGx2qJVwAsHkpqtlN+DaGT08dT64LvIf0bfGvmtm++/WEDWJ HInwg85pGm+sEkYbYFRBD0woPBsL3g== -----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICGTCCAZ+gAwIBAgIQCeCTZaz32ci5PhwLBCou8zAKBggqhkjOPQQDAzBOMQsw +CQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJjAkBgNVBAMTHURp +Z2lDZXJ0IFRMUyBFQ0MgUDM4NCBSb290IEc1MB4XDTIxMDExNTAwMDAwMFoXDTQ2 +MDExNDIzNTk1OVowTjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDkRpZ2lDZXJ0LCBJ +bmMuMSYwJAYDVQQDEx1EaWdpQ2VydCBUTFMgRUNDIFAzODQgUm9vdCBHNTB2MBAG +ByqGSM49AgEGBSuBBAAiA2IABMFEoc8Rl1Ca3iOCNQfN0MsYndLxf3c1TzvdlHJS +7cI7+Oz6e2tYIOyZrsn8aLN1udsJ7MgT9U7GCh1mMEy7H0cKPGEQQil8pQgO4CLp +0zVozptjn4S1mU1YoI71VOeVyaNCMEAwHQYDVR0OBBYEFMFRRVBZqz7nLFr6ICIS +B4CIfBFqMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49 +BAMDA2gAMGUCMQCJao1H5+z8blUD2WdsJk6Dxv3J+ysTvLd6jLRl0mlpYxNjOyZQ +LgGheQaRnUi/wr4CMEfDFXuxoJGZSZOoPHzoRgaLLPIxAJSdYsiJvRmEFOml+wG4 +DXZDjC5Ty3zfDBeWUA== +-----END CERTIFICATE----- diff --git a/location/gps.xml b/location/gps.xml index 87ced9c..ae7cd4c 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -60,7 +60,7 @@ CpLppeUseAgnssLocForEmptyDbh="true" CpLppHighAccuracyShapeMode="1" ReAidingOnHotStart="false" - ReAidingIntervalSec="1200" + ReAidingIntervalSec="3600" RuntimeSwLteFilterEnable="true" MaxThreadNum="13" SensorsMask="0x244" @@ -93,6 +93,8 @@ EnableB1C="false" EnableCoex="true" + + RTICacheTimeoutSec="3600" /> #include #include +#include using aidl::android::hardware::power::stats::DisplayStateResidencyDataProvider; using aidl::android::hardware::power::stats::EnergyConsumerType; @@ -33,37 +34,44 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer; void addDisplay(std::shared_ptr p) { // Add display residency stats - std::vector states = { - "Off", - "LP: 1008x2244@1", - "LP: 1008x2244@30", - "On: 1008x2244@1", - "On: 1008x2244@10", - "On: 1008x2244@30", - "On: 1008x2244@60", - "On: 1008x2244@120", - "HBM: 1008x2244@1", - "HBM: 1008x2244@10", - "HBM: 1008x2244@30", - "HBM: 1008x2244@60", - "HBM: 1008x2244@120", - "LP: 1344x2992@1", - "LP: 1344x2992@30", - "On: 1344x2992@1", - "On: 1344x2992@10", - "On: 1344x2992@30", - "On: 1344x2992@60", - "On: 1344x2992@120", - "HBM: 1344x2992@1", - "HBM: 1344x2992@10", - "HBM: 1344x2992@30", - "HBM: 1344x2992@60", - "HBM: 1344x2992@120"}; + struct stat buffer; + if (stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) { + // time_in_state doesn't exist + std::vector states = { + "Off", + "LP: 1008x2244@1", + "LP: 1008x2244@30", + "On: 1008x2244@1", + "On: 1008x2244@10", + "On: 1008x2244@30", + "On: 1008x2244@60", + "On: 1008x2244@120", + "HBM: 1008x2244@1", + "HBM: 1008x2244@10", + "HBM: 1008x2244@30", + "HBM: 1008x2244@60", + "HBM: 1008x2244@120", + "LP: 1344x2992@1", + "LP: 1344x2992@30", + "On: 1344x2992@1", + "On: 1344x2992@10", + "On: 1344x2992@30", + "On: 1344x2992@60", + "On: 1344x2992@120", + "HBM: 1344x2992@1", + "HBM: 1344x2992@10", + "HBM: 1344x2992@30", + "HBM: 1344x2992@60", + "HBM: 1344x2992@120"}; - p->addStateResidencyDataProvider(std::make_unique( - "Display", - "/sys/class/backlight/panel0-backlight/state", - states)); + p->addStateResidencyDataProvider(std::make_unique( + "Display", + "/sys/class/backlight/panel0-backlight/state", + states)); + } else { + // time_in_state exists + addDisplayMRR(p); + } // Add display energy consumer p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer( diff --git a/powerstats/shiba/service.cpp b/powerstats/shiba/service.cpp index c29fbca..440f6b8 100644 --- a/powerstats/shiba/service.cpp +++ b/powerstats/shiba/service.cpp @@ -26,6 +26,7 @@ #include #include #include +#include using aidl::android::hardware::power::stats::DisplayStateResidencyDataProvider; using aidl::android::hardware::power::stats::EnergyConsumerType; @@ -33,18 +34,25 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer; void addDisplay(std::shared_ptr p) { // Add display residency stats - std::vector states = { - "Off", - "LP: 1080x2400@30", - "On: 1080x2400@60", - "On: 1080x2400@120", - "HBM: 1080x2400@60", - "HBM: 1080x2400@120"}; + struct stat buffer; + if (stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) { + // time_in_state doesn't exist + std::vector states = { + "Off", + "LP: 1080x2400@30", + "On: 1080x2400@60", + "On: 1080x2400@120", + "HBM: 1080x2400@60", + "HBM: 1080x2400@120"}; - p->addStateResidencyDataProvider(std::make_unique( - "Display", - "/sys/class/backlight/panel0-backlight/state", - states)); + p->addStateResidencyDataProvider(std::make_unique( + "Display", + "/sys/class/backlight/panel0-backlight/state", + states)); + } else { + // time_in_state exists + addDisplayMRR(p); + } // Add display energy consumer p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer( diff --git a/ripcurrent/BoardConfig.mk b/ripcurrent/BoardConfig.mk index d25edd1..22437b6 100644 --- a/ripcurrent/BoardConfig.mk +++ b/ripcurrent/BoardConfig.mk @@ -29,7 +29,7 @@ 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))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml index 6b5ccd8..088641d 100644 --- a/rro_overlays/WifiOverlay/res/values/config.xml +++ b/rro_overlays/WifiOverlay/res/values/config.xml @@ -174,4 +174,11 @@ true + + + true + + 3 + diff --git a/self-extractors_husky/Android.mk b/self-extractors_husky/Android.mk deleted file mode 100644 index e69de29..0000000 diff --git a/self-extractors_husky/extract-lists.txt b/self-extractors_husky/extract-lists.txt index e8333da..9f3c26f 100644 --- a/self-extractors_husky/extract-lists.txt +++ b/self-extractors_husky/extract-lists.txt @@ -5,13 +5,11 @@ IMAGES/vendor_dlkm.img \ RADIO/bootloader.img \ RADIO/radio.img \ - system_ext/etc/permissions/com.android.qns.xml \ system_ext/etc/permissions/com.shannon.imsservice.xml \ system_ext/etc/permissions/com.shannon.rcsservice.xml \ system_ext/lib64/libmediaadaptor.so \ system_ext/priv-app/ShannonRcs/ShannonRcs.apk \ system_ext/priv-app/ShannonIms/ShannonIms.apk \ - system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk \ " ;; diff --git a/self-extractors_husky/google_devices/staging/Android.mk b/self-extractors_husky/google_devices/staging/Android.mk.template similarity index 76% rename from self-extractors_husky/google_devices/staging/Android.mk rename to self-extractors_husky/google_devices/staging/Android.mk.template index e5bcec2..190091e 100644 --- a/self-extractors_husky/google_devices/staging/Android.mk +++ b/self-extractors_husky/google_devices/staging/Android.mk.template @@ -22,22 +22,6 @@ ifneq ($(filter husky,$(TARGET_DEVICE)),) endif ifneq ($(filter husky,$(TARGET_DEVICE)),) -include $(CLEAR_VARS) -LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) -LOCAL_MODULE := PixelQualifiedNetworksService -LOCAL_MODULE_TAGS := optional -LOCAL_BUILT_MODULE_STEM := package.apk -LOCAL_SYSTEM_EXT_MODULE := true -LOCAL_PRIVILEGED_MODULE := true -LOCAL_MODULE_OWNER := google -LOCAL_MODULE_CLASS := APPS -LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE -include $(BUILD_PREBUILT) - include $(CLEAR_VARS) LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) LOCAL_MODULE := ShannonIms diff --git a/self-extractors_husky/google_devices/staging/device-partial.mk b/self-extractors_husky/google_devices/staging/device-partial.mk index 9251f56..a5fd796 100644 --- a/self-extractors_husky/google_devices/staging/device-partial.mk +++ b/self-extractors_husky/google_devices/staging/device-partial.mk @@ -17,7 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \ # AOSP packages required by the blobs PRODUCT_PACKAGES := \ - PixelQualifiedNetworksService \ ShannonIms \ ShannonRcs \ @@ -26,7 +25,6 @@ PRODUCT_PACKAGES += \ # blob(s) necessary for husky hardware PRODUCT_COPY_FILES := \ - vendor/google_devices/husky/proprietary/com.android.qns.xml:system_ext/etc/permissions/com.android.qns.xml:google \ vendor/google_devices/husky/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml:samsung \ vendor/google_devices/husky/proprietary/com.shannon.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \ diff --git a/self-extractors_shiba/Android.mk b/self-extractors_shiba/Android.mk deleted file mode 100644 index e69de29..0000000 diff --git a/self-extractors_shiba/extract-lists.txt b/self-extractors_shiba/extract-lists.txt index e8333da..9f3c26f 100644 --- a/self-extractors_shiba/extract-lists.txt +++ b/self-extractors_shiba/extract-lists.txt @@ -5,13 +5,11 @@ IMAGES/vendor_dlkm.img \ RADIO/bootloader.img \ RADIO/radio.img \ - system_ext/etc/permissions/com.android.qns.xml \ system_ext/etc/permissions/com.shannon.imsservice.xml \ system_ext/etc/permissions/com.shannon.rcsservice.xml \ system_ext/lib64/libmediaadaptor.so \ system_ext/priv-app/ShannonRcs/ShannonRcs.apk \ system_ext/priv-app/ShannonIms/ShannonIms.apk \ - system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk \ " ;; diff --git a/self-extractors_shiba/google_devices/staging/Android.mk b/self-extractors_shiba/google_devices/staging/Android.mk.template similarity index 76% rename from self-extractors_shiba/google_devices/staging/Android.mk rename to self-extractors_shiba/google_devices/staging/Android.mk.template index dbef8e5..fd8fc2a 100644 --- a/self-extractors_shiba/google_devices/staging/Android.mk +++ b/self-extractors_shiba/google_devices/staging/Android.mk.template @@ -22,22 +22,6 @@ ifneq ($(filter shiba,$(TARGET_DEVICE)),) endif ifneq ($(filter shiba,$(TARGET_DEVICE)),) -include $(CLEAR_VARS) -LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) -LOCAL_MODULE := PixelQualifiedNetworksService -LOCAL_MODULE_TAGS := optional -LOCAL_BUILT_MODULE_STEM := package.apk -LOCAL_SYSTEM_EXT_MODULE := true -LOCAL_PRIVILEGED_MODULE := true -LOCAL_MODULE_OWNER := google -LOCAL_MODULE_CLASS := APPS -LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE -include $(BUILD_PREBUILT) - include $(CLEAR_VARS) LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) LOCAL_MODULE := ShannonIms diff --git a/self-extractors_shiba/google_devices/staging/device-partial.mk b/self-extractors_shiba/google_devices/staging/device-partial.mk index 99e217f..9c64f07 100644 --- a/self-extractors_shiba/google_devices/staging/device-partial.mk +++ b/self-extractors_shiba/google_devices/staging/device-partial.mk @@ -17,7 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \ # AOSP packages required by the blobs PRODUCT_PACKAGES := \ - PixelQualifiedNetworksService \ ShannonIms \ ShannonRcs \ @@ -26,7 +25,6 @@ PRODUCT_PACKAGES += \ # blob(s) necessary for shiba hardware PRODUCT_COPY_FILES := \ - vendor/google_devices/shiba/proprietary/com.android.qns.xml:system_ext/etc/permissions/com.android.qns.xml:google \ vendor/google_devices/shiba/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml:samsung \ vendor/google_devices/shiba/proprietary/com.shannon.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \ diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk index 4ae6c8b..116edac 100644 --- a/shiba/BoardConfig.mk +++ b/shiba/BoardConfig.mk @@ -29,7 +29,7 @@ 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))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk diff --git a/shiba/overlay/frameworks/base/core/res/res/values/config.xml b/shiba/overlay/frameworks/base/core/res/res/values/config.xml index a83fa35..5128d0d 100644 --- a/shiba/overlay/frameworks/base/core/res/res/values/config.xml +++ b/shiba/overlay/frameworks/base/core/res/res/values/config.xml @@ -283,6 +283,8 @@ http://www.gstatic.com/android/sms/GKWS6.xml + true + 0.335 diff --git a/shiba/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/shiba/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml index 6a1cb5a..0e42fa6 100644 --- a/shiba/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml +++ b/shiba/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -26,7 +26,7 @@ Cellular_data - + Sound_trigger diff --git a/shiba/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/shiba/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index 0592ba2..cd6d1db 100644 --- a/shiba/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/shiba/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -30,4 +30,7 @@ 6px 17px + + + 59.5 diff --git a/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gpj41_in.png b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gpj41_in.png new file mode 100644 index 0000000..5fe1ec1 Binary files /dev/null and b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gpj41_in.png differ diff --git a/shiba/rro_overlays/NfcOverlay/res/values/config.xml b/shiba/rro_overlays/NfcOverlay/res/values/config.xml index 5bdeca6..81fbc45 100644 --- a/shiba/rro_overlays/NfcOverlay/res/values/config.xml +++ b/shiba/rro_overlays/NfcOverlay/res/values/config.xml @@ -32,4 +32,5 @@ 97 + true diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index 9e659ee..b08761a 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -582,21 +582,21 @@ "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] + "CdevCeiling": [0, 2, 6, 6, 6, 6, 6] }, { "CdevRequest": "thermal-cpufreq-1", "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 9, 9, 9, 9, 9, 9] + "CdevCeiling": [0, 6, 9, 9, 9, 9, 9] }, { "CdevRequest": "thermal-cpufreq-2", "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 12, 12, 12, 12, 12, 12] + "CdevCeiling": [0, 8, 12, 12, 12, 12, 12] } ] } diff --git a/thermal/thermal_info_config_ripcurrent.json b/thermal/thermal_info_config_ripcurrent.json index 266965d..45d2f36 100644 --- a/thermal/thermal_info_config_ripcurrent.json +++ b/thermal/thermal_info_config_ripcurrent.json @@ -175,17 +175,7 @@ "Multiplier":1, "Monitor":true, "PollingDelay":0, - "PassiveDelay":1000, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 3, 3, 3] - } - ] + "PassiveDelay":1000 }, { "Name":"BCL_AUDIO_BAACL", @@ -239,17 +229,7 @@ "Multiplier":1, "Monitor":true, "PollingDelay":0, - "PassiveDelay":1000, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 2, 2, 2] - } - ] + "PassiveDelay":1000 }, { "Name":"vdroop2", @@ -276,17 +256,7 @@ "Multiplier":1, "Monitor":true, "PollingDelay":0, - "PassiveDelay":1000, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - } - ] + "PassiveDelay":1000 }, { "Name":"smpl_gm", @@ -313,161 +283,7 @@ "Multiplier":1, "Monitor":true, "PollingDelay":0, - "PassiveDelay":1000, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 3, 3, 3] - } - ] - }, - { - "Name":"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 - ], - "VrThreshold":"NaN", - "Multiplier":1 - }, - { - "Name":"ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NaN", - "NaN", - "NaN", - "NaN", - 10500, - "NaN", - "NaN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NaN", - "Multiplier":1 - }, - { - "Name":"ocp_gpu", - "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 - ], - "VrThreshold":"NaN", - "Multiplier":1 - }, - { - "Name":"soft_ocp_cpu2", - "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 - ], - "VrThreshold":"NaN", - "Multiplier":1 - }, - { - "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 - ], - "VrThreshold":"NaN", - "Multiplier":1 - }, - { - "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 - ], - "VrThreshold":"NaN", - "Multiplier":1 + "PassiveDelay":1000 }, { "Name":"TPU", diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index 988dac3..bc6bdf1 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -550,21 +550,21 @@ "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] + "CdevCeiling": [0, 2, 6, 6, 6, 6, 6] }, { "CdevRequest": "thermal-cpufreq-1", "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 9, 9, 9, 9, 9, 9] + "CdevCeiling": [0, 6, 9, 9, 9, 9, 9] }, { "CdevRequest": "thermal-cpufreq-2", "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 12, 12, 12, 12, 12, 12] + "CdevCeiling": [0, 8, 12, 12, 12, 12, 12] } ] }