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
# eJHNAJ9EAMySmKX48nu3f04yk/R+LsvKhgCdFFlGXbkMg0yf+/gpFNhj1zNP3IA=
# =q/dZ
# -----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 <[email protected]>" [marginal]
# gpg: [email protected]: Verified 2399 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 (11) and others
# Via Automerger Merge Worker (232) and others
* tag 'android-14.0.0_r29': (23 commits)
  Revert^2 "sunfish(nfc): Modify NFC overlays for NFC apex"
  Revert^2 "sunfish: Replace NFC app with NFC apex"
  Revert^2 "sunfish(nfc): Modify NFC overlays for NFC apex"
  Revert^2 "sunfish: Replace NFC app with NFC apex"
  sunfish: update AIDL IGoogleBattery manifest version to 3
  Remove unused Android.mk under device/google/sunfish
  Revert "sunfish: Replace NFC app with NFC apex"
  Revert "sunfish(nfc): Modify NFC overlays for NFC apex"
  Revert "sunfish(nfc): Modify NFC overlays for NFC apex"
  Revert "sunfish: Replace NFC app with NFC apex"
  Fix lunch choices for git_main
  sunfish(nfc): Modify NFC overlays for NFC apex
  Fix lunch choices for git_main
  sunfish: Replace NFC app with NFC apex
  sunfish: Replace NFC app with NFC apex
  usb: upgrade stats AIDL to v2
  Update sunfish SVN to 65
  Expect wifi_ext V2-V3 in the framework manifest
  sunfish: update thermal HAL makefile path
  device FCM -= android.*
  ...

 Conflicts:
	Android.mk
	AndroidProducts.mk
	device.mk
	device_framework_matrix_product.xml

Change-Id: Idc7b28f15b2e80152256dacd038467c2db3be178

AndroidProducts.mk

@@ -20,5 +20,5 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/lineage_sunfish.mk
 
 COMMON_LUNCH_CHOICES := \
-    aosp_sunfish-userdebug \
-    lineage_sunfish-userdebug
+    aosp_sunfish-trunk_staging-userdebug \
+    lineage_sunfish-trunk_staging-userdebug

device.mk

@@ -413,7 +413,8 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     Tag \
     android.hardware.nfc-service.st \
-    [email protected]
+    [email protected] \
+    NfcOverlaySunfish
 
 PRODUCT_COPY_FILES += \
     device/google/sunfish/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \
@@ -836,6 +837,9 @@ endif
 # Project
 include hardware/google/pixel/common/pixel-common-device.mk
 
+# gs-common
+include device/google/gs-common/misc_writer/misc_writer.mk
+
 # Citadel
 include hardware/google/pixel/citadel/citadel.mk
 
@@ -854,7 +858,7 @@ include hardware/google/pixel/citadel/citadel.mk
 -include hardware/google/pixel/mm/device_legacy.mk
 
 # thermal
--include hardware/google/pixel/thermal/device.mk
+include device/google/gs-common/thermal/thermal_hal/device.mk
 
 # Pixel Logger
 include hardware/google/pixel/PixelLogger/PixelLogger.mk

device_framework_matrix_product.xml

@@ -42,37 +42,6 @@
             <instance>slot2</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
-        <name>android.hardware.media.c2</name>
-        <version>1.0</version>
-        <interface>
-            <name>IComponentStore</name>
-            <instance>default</instance>
-            <instance>software</instance>
-        </interface>
-        <interface>
-            <name>IConfigurable</name>
-            <instance>default</instance>
-            <instance>software</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="true">
-        <name>android.hardware.radio</name>
-        <transport>hwbinder</transport>
-        <version>1.2</version>
-        <interface>
-            <name>ISap</name>
-            <instance>slot2</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="true">
-        <name>android.hardware.radio.config</name>
-        <version>1.1</version>
-        <interface>
-            <name>IRadioConfig</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.display.config</name>
         <version>1.11</version>
@@ -83,7 +52,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>vendor.google.google_battery</name>
-        <version>2</version>
+        <version>2-3</version>
         <interface>
             <name>IGoogleBattery</name>
             <instance>default</instance>

rro_overlays/NfcOverlay/Android.bp

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

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>

rro_overlays/NfcOverlay/OWNERS

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

rro_overlays/NfcOverlay/res/values/config.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 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>G025J</item>
+    <item>G025N</item>
+    <item>G025M</item>
+  </string-array>
+</resources>

usb/usb/Android.bp

@@ -38,7 +38,7 @@ cc_binary {
         "[email protected]",
         "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",
     ],
 }