Snap for 11227258 from e765ab049d to 24Q2-release
Change-Id: I43a5fe226c13049469c2ebf1f02c828ac55fb336
This commit is contained in:
Android Build Coastguard Worker
commit
77384c42fa
7 changed files with 184 additions and 3 deletions
|
|
@ -23,6 +23,8 @@ endif
|
|||
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_BLUEJAY_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
|
||||
|
|
|
|||
9
bluejay/rro_overlays/NfcOverlay/Android.bp
Normal file
9
bluejay/rro_overlays/NfcOverlay/Android.bp
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
package {
|
||||
default_applicable_licenses: ["device_google_bluejay_license"],
|
||||
}
|
||||
|
||||
runtime_resource_overlay {
|
||||
name: "NfcOverlayBluejay",
|
||||
sdk_version: "current",
|
||||
product_specific: true
|
||||
}
|
||||
27
bluejay/rro_overlays/NfcOverlay/AndroidManifest.xml
Normal file
27
bluejay/rro_overlays/NfcOverlay/AndroidManifest.xml
Normal 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>
|
||||
2
bluejay/rro_overlays/NfcOverlay/OWNERS
Normal file
2
bluejay/rro_overlays/NfcOverlay/OWNERS
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
# Bug component: 48448
|
||||
include platform/packages/apps/Nfc:/OWNERS
|
||||
35
bluejay/rro_overlays/NfcOverlay/res/values/config.xml
Normal file
35
bluejay/rro_overlays/NfcOverlay/res/values/config.xml
Normal 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">false</bool>
|
||||
<string-array name="config_skuSupportsSecureNfc" translatable="false">
|
||||
<item>GB62Z</item>
|
||||
<item>G1AZG</item>
|
||||
<item>GX7AS</item>
|
||||
<item>GB17L</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>83</item>
|
||||
</integer-array>
|
||||
</resources>
|
||||
|
|
@ -42,6 +42,8 @@ include device/google/gs-common/touch/stm/stm11.mk
|
|||
GOODIX_CONFIG_BUILD_VERSION := g7_trusty
|
||||
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/24Q1
|
||||
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
|
||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/24Q2
|
||||
else
|
||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/trunk
|
||||
endif
|
||||
|
|
@ -109,9 +111,10 @@ PRODUCT_COPY_FILES += \
|
|||
device/google/bluejay/nfc/libnfc-nci.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 \
|
||||
NfcOverlayBluejay
|
||||
|
||||
# SecureElement
|
||||
PRODUCT_PACKAGES += \
|
||||
|
|
@ -132,7 +135,7 @@ PRODUCT_SOONG_NAMESPACES += \
|
|||
|
||||
# Increment the SVN for any official public releases
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
ro.vendor.build.svn=53
|
||||
ro.vendor.build.svn=54
|
||||
|
||||
# DCK properties based on target
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
|
|
@ -143,6 +146,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
|
|||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts
|
||||
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/24Q1
|
||||
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
|
||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/24Q2
|
||||
else
|
||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/trunk
|
||||
endif
|
||||
|
|
|
|||
101
powerhint.json
101
powerhint.json
|
|
@ -46,6 +46,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",
|
||||
|
|
@ -73,6 +83,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",
|
||||
|
|
@ -100,6 +120,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": "GPUMinFreq",
|
||||
"Path": "/sys/devices/platform/1c500000.mali/hint_min_freq",
|
||||
|
|
@ -135,11 +165,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",
|
||||
|
|
@ -547,6 +588,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",
|
||||
|
|
@ -1537,6 +1608,36 @@
|
|||
"Duration": 0,
|
||||
"Value": "400000"
|
||||
},
|
||||
{
|
||||
"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",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue