Snap for 11227258 from 201e0d7659 to 24Q2-release

Change-Id: I7cc3e7611ae617b17ae3f361936dd4328af92eba
This commit is contained in:
Android Build Coastguard Worker 2023-12-16 02:01:54 +00:00
commit 9de4768652
8 changed files with 202 additions and 5 deletions

View file

@ -44,6 +44,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.leaudio.dual_bidirection_swb.supported=false
# LE Audio Lunch Config for Phase 1 (LE audio toggle hidden by default)
PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.leaudio.toggle_visible=false
# LE Auido Offload Capabilities setting
PRODUCT_COPY_FILES += \
device/google/lynx/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml

View file

@ -80,9 +80,10 @@ PRODUCT_COPY_FILES += \
device/google/lynx/nfc/libnfc-nci-lynx.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
PRODUCT_PACKAGES += \
NfcNci \
$(RELEASE_PACKAGE_NFC_STACK) \
Tag \
android.hardware.nfc-service.st
android.hardware.nfc-service.st \
NfcOverlayLynx
# SecureElement
PRODUCT_PACKAGES += \
@ -149,6 +150,8 @@ include device/google/lynx/bluetooth/qti_default.mk
GOODIX_CONFIG_BUILD_VERSION := g7_trusty
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/24Q1
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/24Q2
else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/trunk
endif
@ -175,6 +178,8 @@ PRODUCT_VENDOR_PROPERTIES += \
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/24Q1
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/24Q2
else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/trunk
endif
@ -218,7 +223,7 @@ PRODUCT_VENDOR_PROPERTIES += \
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=25
ro.vendor.build.svn=29
# Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \
@ -280,7 +285,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
##Audio Vendor property
PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.audio.cca.enabled=true
persist.vendor.audio.cca.enabled=false
# userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))

View file

@ -20,6 +20,8 @@ TARGET_BOOTLOADER_BOARD_NAME := lynx
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_LYNX_RADIO_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

View file

@ -61,6 +61,16 @@
],
"ResetOnInit": true
},
{
"Name": "CPULittleClusterDownRateLimitUs",
"Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us",
"Values": [
"5000",
"500"
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{
"Name": "CPUMidClusterMaxFreq",
"Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq",
@ -89,6 +99,16 @@
],
"ResetOnInit": true
},
{
"Name": "CPUMidClusterDownRateLimitUs",
"Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us",
"Values": [
"20000",
"3000"
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{
"Name": "CPUBigClusterMaxFreq",
"Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq",
@ -117,6 +137,16 @@
],
"ResetOnInit": true
},
{
"Name": "CPUBigClusterDownRateLimitUs",
"Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us",
"Values": [
"20000",
"3000"
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{
"Name": "ReducePreferIdle",
"Path": "/proc/vendor_sched/reduce_prefer_idle",
@ -141,11 +171,22 @@
"Path": "/proc/vendor_sched/dvfs_headroom",
"Values": [
"1280",
"1100",
"1100 1078 1024"
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{
"Name": "CPUTaperedDVFSHeadroomEnable",
"Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable",
"Values": [
"0",
"1"
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{
"Name": "MIFTargetLoad",
"Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
@ -300,7 +341,7 @@
"Values": [
"0",
"1"
],
]
},
{
"Name": "DisplayWakeup",
@ -660,6 +701,36 @@
"Duration": 5000,
"Value": "1"
},
{
"PowerHint": "LAUNCH",
"Node": "CPUDVFSHeadroom",
"Duration": 5000,
"Value": "1280"
},
{
"PowerHint": "LAUNCH",
"Node": "CPUTaperedDVFSHeadroomEnable",
"Duration": 5000,
"Value": "0"
},
{
"PowerHint": "LAUNCH",
"Node": "CPULittleClusterDownRateLimitUs",
"Duration": 5000,
"Value": "5000"
},
{
"PowerHint": "LAUNCH",
"Node": "CPUMidClusterDownRateLimitUs",
"Duration": 5000,
"Value": "20000"
},
{
"PowerHint": "LAUNCH",
"Node": "CPUBigClusterDownRateLimitUs",
"Duration": 5000,
"Value": "20000"
},
{
"PowerHint": "LAUNCH",
"Node": "CPUBigClusterMaxFreq",
@ -965,6 +1036,18 @@
"Duration": 1000,
"Value": "664000"
},
{
"PowerHint": "CAMERA_ZOOMING_BOOST",
"Node": "CDPreferIdle",
"Duration": 100,
"Value": "1"
},
{
"PowerHint": "CAMERA_ZOOMING_BOOST",
"Node": "PMU_POLL",
"Duration": 100,
"Value": "0"
},
{
"PowerHint": "GCA_CAMERA_SHOT_BIGCPU",
"Node": "TAPreferHighCap",
@ -1662,6 +1745,36 @@
"Duration": 0,
"Value": "572000"
},
{
"PowerHint": "GAME",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
"Value": "1100"
},
{
"PowerHint": "GAME",
"Node": "CPUTaperedDVFSHeadroomEnable",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "GAME",
"Node": "CPULittleClusterDownRateLimitUs",
"Duration": 0,
"Value": "500"
},
{
"PowerHint": "GAME",
"Node": "CPUMidClusterDownRateLimitUs",
"Duration": 0,
"Value": "3000"
},
{
"PowerHint": "GAME",
"Node": "CPUBigClusterDownRateLimitUs",
"Duration": 0,
"Value": "3000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
"Node": "PMU_POLL",

View file

@ -0,0 +1,9 @@
package {
default_applicable_licenses: ["device_google_lynx_license"],
}
runtime_resource_overlay {
name: "NfcOverlayLynx",
sdk_version: "current",
product_specific: true
}

View file

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2023 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.
-->
<!-- Pixel specific nfc overlays -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.nfc.overlay"
android:versionCode="1"
android:versionName="1.0">
<application android:hasCode="false" />
<overlay
android:targetPackage="com.android.nfc"
android:targetName="NfcCustomization"
android:isStatic="true"
android:priority="0"/>
</manifest>

View file

@ -0,0 +1,2 @@
# Bug component: 48448
include platform/packages/apps/Nfc:/OWNERS

View file

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2022 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.
-->
<resources>
<bool name="nfcc_always_on_allowed">false</bool>
<string-array name="config_skuSupportsSecureNfc" translatable="false">
<item>G0DZQ</item>
<item>GWKK3</item>
<item>GHL1X</item>
<item>G82U8</item>
</string-array>
<bool name="tag_intent_app_pref_supported">true</bool>
<!-- NFC Antenna Location API -->
<integer name="device_width">70</integer>
<integer name="device_height">150</integer>
<bool name="device_foldable">false</bool>
<integer-array name="antenna_x">
<item>36</item>
</integer-array>
<integer-array name="antenna_y">
<item>102</item>
</integer-array>
</resources>