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

Android 14.0.0 release 29

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZeZWxAAKCRDorT+BmrEO
# eC+EAJ0aGQrbikU0Rc9r5KeLwPIqv7GvCwCdEbWUKnCwHeo8nyNqTrAXbc6UYEs=
# =DSu9
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Mar  5 01:18:28 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 2397 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 (65) and others
* tag 'android-14.0.0_r29':
  Revert^2 "bramble(nfc): Modify NFC overlays for NFC apex"
  Revert^2 "bramble(nfc): Modify NFC overlays for NFC apex"
  Revert "bramble(nfc): Modify NFC overlays for NFC apex"
  Revert "bramble(nfc): Modify NFC overlays for NFC apex"
  Fix lunch choices for git_main
  Fix lunch choices for git_main
  bramble(nfc): Modify NFC overlays for NFC apex
  Add BUILD_BROKEN_INCORRECT_PARTITION_IMAGES
  usb: upgrade stats AIDL to v2
  Add hardware/qcom/wlan namespace

 Conflicts:
	AndroidProducts.mk
	bramble/BoardConfig.mk

Change-Id: Id3764e0a73e8f21b7d16aea8bd5a1765ded6b531

AndroidProducts.mk

@@ -21,5 +21,5 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/lineage_bramble.mk
 
 COMMON_LUNCH_CHOICES := \
-    aosp_bramble-userdebug \
-    lineage_bramble-userdebug
+    aosp_bramble-trunk_staging-userdebug \
+    lineage_bramble-trunk_staging-userdebug

bramble/BoardConfig.mk

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

bramble/rro_overlays/NfcOverlay/Android.bp

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

bramble/rro_overlays/NfcOverlay/AndroidManifest.xml

@@ -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>

bramble/rro_overlays/NfcOverlay/OWNERS

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

bramble/rro_overlays/NfcOverlay/res/values/config.xml

@@ -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="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>G025E</item>
+    <item>G025I</item>
+    <item>G025H</item>
+    <item>G6QU3</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>39</item>
+  </integer-array>
+  <integer-array name="antenna_y">
+    <item>87</item>
+  </integer-array>
+</resources>

device-bramble.mk

@@ -192,3 +192,6 @@ PRODUCT_PACKAGES += \
 # Workaround for Qualcomm neural network HAL
 PRODUCT_PACKAGES += \
     libprotobuf-cpp-full-3.9.1-vendorcompat
+
+PRODUCT_PACKAGES += \
+    NfcOverlayBramble

usb/usb/Android.bp

@@ -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",
     ],
 }