Snap for 11227258 from 302f0a318f to 24Q2-release

Change-Id: Iee177d04ad112807b48aff6e016afdc5aeee9153
This commit is contained in:
Android Build Coastguard Worker 2023-12-16 02:01:46 +00:00
commit a6d53db7b3
9 changed files with 97 additions and 7 deletions

View file

@ -100,9 +100,10 @@ PRODUCT_COPY_FILES += \
device/google/felix/nfc/libnfc-nci-felix.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 \
NfcOverlayFelix
# SecureElement
PRODUCT_PACKAGES += \
@ -210,7 +211,7 @@ PRODUCT_SOONG_NAMESPACES += \
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=33
ro.vendor.build.svn=37
# Vibrator HAL
PRODUCT_VENDOR_PROPERTIES +=\
@ -256,6 +257,8 @@ PRODUCT_PACKAGES += \
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q1
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q2
else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/trunk
endif
@ -308,7 +311,7 @@ PRODUCT_VENDOR_PROPERTIES += \
##Audio Vendor property
PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.audio.cca.enabled=true
persist.vendor.audio.cca.enabled=false
# Camera
PRODUCT_PROPERTY_OVERRIDES += \

View file

@ -23,6 +23,8 @@ BOARD_KERNEL_CMDLINE += swiotlb=noforce
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_FELIX_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

@ -19,5 +19,5 @@
<!-- Weather clock smartspace positioning to apply for the weather clock on tablets -->
<item name="weather_clock_smartspace_scale" type="dimen" format="float">0.85</item>
<dimen name="weather_clock_smartspace_translateX">-40dp</dimen>
<dimen name="weather_clock_smartspace_translateY">-5dp</dimen>
<dimen name="weather_clock_smartspace_translateY">-15dp</dimen>
</resources>

View file

@ -114,7 +114,7 @@
</hal>
<hal format="aidl">
<name>vendor.google.google_battery</name>
<version>2-3</version>
<version>3</version>
<interface>
<name>IGoogleBattery</name>
<instance>default</instance>

View file

@ -319,7 +319,7 @@
"Values": [
"0",
"1"
],
]
},
{
"Name": "DisplayWakeup",
@ -1053,6 +1053,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_RANK1",
"Node": "TAPreferHighCap",

View file

@ -0,0 +1,9 @@
package {
default_applicable_licenses: ["device_google_felix_license"],
}
runtime_resource_overlay {
name: "NfcOverlayFelix",
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) 2021 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">true</bool>
<string-array name="config_skuSupportsSecureNfc" translatable="false">
<item>G9FPL</item>
<item>G0B96</item>
</string-array>
<bool name="tag_intent_app_pref_supported">true</bool>
<!-- NFC Antenna Location API -->
<integer name="device_width">160</integer>
<integer name="device_height">140</integer>
<bool name="device_foldable">true</bool>
<integer-array name="antenna_x">
<item>90</item>
<item>30</item>
</integer-array>
<integer-array name="antenna_y">
<item>103</item>
<item>103</item>
</integer-array>
</resources>