Evolution-x-devices/device_google_redfin
2
0
Fork 0
mirror of https://github.com/Evolution-X-Devices/device_google_redfin synced 2026-01-27 14:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'android-14.0.0_r29' into staging/lineage-21_merge-android-14.0.0_r29

Browse Source 
Android 14.0.0 release 29

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZeZWwgAKCRDorT+BmrEO
# eNE9AJ436si4iGfuXraq4i9WmLWWNa6Q4gCgjhDz+mf+NpY25sntQxSTVhlr4+o=
# =0XyA
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Mar  5 01:18:26 2024 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2395 signatures in the past
#      2 years.  Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Roshan Pius (5) and others
# Via Automerger Merge Worker (97) and others
* tag 'android-14.0.0_r29':
  Revert^2 "redfin(nfc): Modify NFC overlays for NFC apex"
  Revert^2 "redfin(nfc): Modify NFC overlays for NFC apex"
  Remove unused Android.mk under device/google/redfin
  WLC: update AIDL manifest version to 1-2
  Revert "WLC: update AIDL manifest version to 2"
  WLC: update AIDL manifest version to 2
  Revert "redfin(nfc): Modify NFC overlays for NFC apex"
  Revert "redfin(nfc): Modify NFC overlays for NFC apex"
  Fix lunch choices for git_main
  Fix lunch choices for git_main
  redfin(nfc): Modify NFC overlays for NFC apex
  Add BUILD_BROKEN_INCORRECT_PARTITION_IMAGES
  usb: upgrade stats AIDL to v2
  device FCM -= android.*
  Add hardware/qcom/wlan namespace

 Conflicts:
	AndroidProducts.mk
	redfin/BoardConfig.mk

Change-Id: Ie3cf1f67798757f4d6316141b6baf69e4b86ebb2
This commit is contained in:
Michael Bestas
2024-03-10 09:52:12 +02:00
parent b0d6420720 3689ae5907
commit 1df01c1fdd
14 changed files with 87 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AndroidProducts.mk
View File

@@ -23,6 +23,6 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/lineage_redfin.mk
COMMON_LUNCH_CHOICES := \
aosp_redfin-userdebug \
aosp_redfin_vf-userdebug \
lineage_redfin-userdebug
aosp_redfin-trunk_staging-userdebug \
aosp_redfin_vf-trunk_staging-userdebug \
lineage_redfin-trunk_staging-userdebug

3
device-redfin.mk
View File

@@ -231,3 +231,6 @@ endif
# Workaround for prebuilt Qualcomm neural network HAL
PRODUCT_PACKAGES += \
libprotobuf-cpp-full-3.9.1-vendorcompat
PRODUCT_PACKAGES += \
NfcOverlayRedfin

2
redfin/BoardConfig.mk
View File

@@ -33,4 +33,6 @@ else
-include vendor/google_devices/redfin/proprietary/BoardConfigVendor.mk
endif
BUILD_BROKEN_INCORRECT_PARTITION_IMAGES := true
include device/google/redfin/BoardConfigLineage.mk

9
redfin/rro_overlays/NfcOverlay/Android.bp Normal file
View File

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

27
redfin/rro_overlays/NfcOverlay/AndroidManifest.xml Normal file
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>

2
redfin/rro_overlays/NfcOverlay/OWNERS Normal file
View File

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

38
redfin/rro_overlays/NfcOverlay/res/values/config.xml Normal file
View File

@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2020 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="polling_disable_allowed">true</bool>
<bool name="enable_antenna_blocked_alert">false</bool>
<integer name="max_antenna_blocked_failure_count">10</integer>
<integer name="unknown_tag_polling_delay">2000</integer>
<string name="antenna_blocked_alert_link" translatable="false">https://support.google.com/pixelphone?p=nfc_tag_notification</string>
<string-array name="config_skuSupportsSecureNfc" translatable="false">
<item>GD1YQ</item>
<item>GTT9Q</item>
<item>G5NZ6</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">140</integer>
<bool name="device_foldable">false</bool>
<integer-array name="antenna_x">
<item>39</item>
</integer-array>
<integer-array name="antenna_y">
<item>74</item>
</integer-array>
</resources>

0
self-extractors/Android.mk
View File

0
self-extractors/google_devices/staging/Android.mk → self-extractors/google_devices/staging/Android.mk.template
View File

0
self-extractors/qcom/staging/Android.mk → self-extractors/qcom/staging/Android.mk.template
View File

4
usb/usb/Android.bp
View File

@@ -38,7 +38,7 @@ cc_binary {
"android.hardware.usb.gadget@1.0",
"android.hardware.usb-V1-ndk",
"libcutils",
"android.frameworks.stats-V1-ndk",
"android.frameworks.stats-V2-ndk",
"pixelatoms-cpp",
"libbinder_ndk",
@@ -48,7 +48,7 @@ cc_binary {
"libpixelstats",
],
export_shared_lib_headers: [
"android.frameworks.stats-V1-ndk",
"android.frameworks.stats-V2-ndk",
"pixelatoms-cpp",
],
}

25
vf/device_framework_matrix_product.R.5.xml
View File

@@ -41,31 +41,6 @@
<instance>slot2</instance>
</interface>
</hal>
<hal format="hidl" optional="false">
<name>android.hardware.media.c2</name>
<version>1.0</version>
<interface>
<name>IComponentStore</name>
<instance>default</instance>
<instance>software</instance>
</interface>
</hal>
<hal format="hidl" optional="false">
<name>android.hardware.radio</name>
<version>1.2</version>
<interface>
<name>ISap</name>
<instance>slot2</instance>
</interface>
</hal>
<hal format="hidl" optional="false">
<name>android.hardware.radio.config</name>
<version>1.1</version>
<interface>
<name>IRadioConfig</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="false">
<name>vendor.display.color</name>
<version>1.0-5</version>

25
vf/device_framework_matrix_product.S.5.xml
View File

@@ -41,31 +41,6 @@
<instance>slot2</instance>
</interface>
</hal>
<hal format="hidl" optional="false">
<name>android.hardware.media.c2</name>
<version>1.0</version>
<interface>
<name>IComponentStore</name>
<instance>default</instance>
<instance>software</instance>
</interface>
</hal>
<hal format="hidl" optional="false">
<name>android.hardware.radio</name>
<version>1.2</version>
<interface>
<name>ISap</name>
<instance>slot2</instance>
</interface>
</hal>
<hal format="hidl" optional="false">
<name>android.hardware.radio.config</name>
<version>1.1</version>
<interface>
<name>IRadioConfig</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="false">
<name>vendor.display.color</name>
<version>1.0-5</version>

2
wireless_charger/compatibility_matrix.xml
View File

@@ -1,7 +1,7 @@
<compatibility-matrix version="1.0" type="framework" level="7">
<hal format="aidl" optional="true">
<name>vendor.google.wireless_charger</name>
<version>1</version>
<version>1-2</version>
<interface>
<name>IWirelessCharger</name>
<instance>default</instance>