Snap for 11819167 from 0fd087c0c86d3f89a84e5a837415f1200dc2235a to busytown-mac-infra-releasebusytown-mac-infra-release

Change-Id: I307a713715c2bd00ebed85ff9c6cbe0675ee24b3

15 files changed, 119 insertions, 8 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 44813d7..4087c6c 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -20,4 +20,4 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_bramble_hwasan.mk \
 
 COMMON_LUNCH_CHOICES := \
-    aosp_bramble-userdebug \
+    aosp_bramble-trunk_staging-userdebug \
diff --git a/bramble/BoardConfig.mk b/bramble/BoardConfig.mk
index f1f2db7..bed4081 100644
--- a/bramble/BoardConfig.mk
+++ b/bramble/BoardConfig.mk
@@ -13,8 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-ifdef PHONE_CAR_BOARD_PRODUCT
-    include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
+ifdef AUTOMOTIVE_PRODUCT_PATH
+    #RBC# include_top device/google/auto_tcu
+    #RBC# include_top device/google/pixel_tcu
+    #RBC# include_top device/google_car
+    include device/$(AUTOMOTIVE_PRODUCT_PATH)/BoardConfig.mk
 else
     TARGET_BOOTLOADER_BOARD_NAME := bramble
     TARGET_SCREEN_DENSITY := 420
@@ -28,3 +31,5 @@ else
 
     -include vendor/google_devices/bramble/proprietary/BoardConfigVendor.mk
 endif
+
+BUILD_BROKEN_INCORRECT_PARTITION_IMAGES := true
diff --git a/bramble/init.bramble.rc b/bramble/init.bramble.rc
index 641f428..2d30f05 100644
--- a/bramble/init.bramble.rc
+++ b/bramble/init.bramble.rc
@@ -38,6 +38,7 @@ on property:debug.touch_sensitivity_mode=1
 service vendor.mdm_helper /vendor/bin/mdm_helper
     class core
     group system wakelock
+    user root
 
 on late-init
     chown system system /sys/devices/virtual/thermal/tz-by-name/skin-therm-monitor/trip_point_0_temp
diff --git a/bramble/overlay/frameworks/base/core/res/res/values/config.xml b/bramble/overlay/frameworks/base/core/res/res/values/config.xml
index 7099d5e..2f576c6 100755
--- a/bramble/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/bramble/overlay/frameworks/base/core/res/res/values/config.xml
@@ -243,6 +243,16 @@
         <item>0:2:15</item> <!-- ID0:Fingerprint:Strong -->
     </string-array>
 
-    <!-- the number of the max cached processes in the system. -->
-    <integer name="config_customizedMaxCachedProcesses">64</integer>
+    <!-- A string config in svg path format for the main display shape.
+         (@see https://www.w3.org/TR/SVG/paths.html#PathData).
+
+         This config must be set unless:
+         1. {@link Configuration#isScreenRound} is true which means the display shape is circular
+            and the system will auto-generate a circular shape.
+         2. The display has no rounded corner and the system will auto-generate a rectangular shape.
+         (@see DisplayShape#createDefaultDisplayShape)
+
+         Note: If the display supports multiple resolutions, please define the path config based on
+         the highest resolution so that it can be scaled correctly in each resolution. -->
+    <string name="config_mainDisplayShape">M 202 0 C 186.538 -1.8503699e-17 171.07633 -0.0090768392 155.2832 0.11132812 C 139.48005 0.22169933 123.3246 0.3920003 107.74219 1.1445312 C 76.567319 2.6295259 48.974256 6.141255 27.572266 27.533203 C 22.214242 32.881191 17.529428 39.351842 14.308594 45.261719 C 11.097793 51.161562 8.6690884 57.493843 6.8730469 64.15625 C 3.2809639 77.4911 2.0764819 92.3107 1.3339844 107.87305 C 0.59148674 123.43538 0.33073003 139.58996 0.16015625 155.37305 C -0.010417528 171.14609 3.700736e-17 186.57814 0 202 L 0 2339.8496 L 0.0390625 2102 C 0.0390625 2122.8 0.03039087 2143.7497 0.15039062 2163.0195 C 0.25039044 2180.8795 0.37929814 2197.1803 1.0292969 2212.5703 L 1.0292969 2212.7207 C 1.0792967 2213.8907 1.1294533 2215.0492 1.1894531 2216.1992 C 1.9794515 2232.6592 3.4601652 2248.5005 7.9101562 2263.7305 C 9.020154 2267.5405 10.320082 2271.2909 11.830078 2274.9609 C 13.340076 2278.6209 14.920318 2281.9495 17.070312 2285.7695 C 21.370304 2293.4095 26.799387 2300.5999 33.109375 2306.9199 C 39.429363 2313.2299 46.61978 2318.6609 54.259766 2322.9609 C 54.669764 2323.1909 55.080236 2323.4206 55.490234 2323.6406 C 67.58021 2330.2206 81.009714 2334.0106 94.679688 2336.1406 C 99.359678 2336.8706 104.06986 2337.4194 108.83984 2337.8594 C 113.76984 2338.2994 118.76055 2338.5996 123.81055 2338.8496 C 125.94053 2338.9496 128.08 2339.0391 130.25 2339.1191 C 132.49 2339.1991 134.73953 2339.2701 137.01953 2339.3301 C 146.43951 2339.5901 156.30066 2339.7303 166.64062 2339.8203 C 170.03062 2339.8503 173.48025 2339.8706 176.99023 2339.8906 C 196.26021 2340.0106 217.20004 2340 238 2340 L 842 2340 C 862.79996 2340 883.73979 2340.0106 903.00977 2339.8906 C 906.51975 2339.8706 909.96938 2339.8503 913.35938 2339.8203 C 923.69934 2339.7303 933.56049 2339.5901 942.98047 2339.3301 C 945.26047 2339.2701 947.51 2339.1991 949.75 2339.1191 C 951.92 2339.0391 954.05947 2338.9496 956.18945 2338.8496 C 961.23945 2338.5996 966.23016 2338.2994 971.16016 2337.8594 C 975.93014 2337.4194 980.64033 2336.8706 985.32031 2336.1406 C 998.99029 2334.0106 1012.4198 2330.2206 1024.5098 2323.6406 C 1024.9198 2323.4206 1025.3302 2323.1909 1025.7402 2322.9609 C 1033.3802 2318.6609 1040.5706 2313.2299 1046.8906 2306.9199 C 1053.2006 2300.5999 1058.6297 2293.4095 1062.9297 2285.7695 C 1065.0797 2281.9495 1066.6599 2278.6209 1068.1699 2274.9609 C 1069.6799 2271.2909 1070.9798 2267.5405 1072.0898 2263.7305 C 1076.5398 2248.5005 1078.0205 2232.6592 1078.8105 2216.1992 C 1078.8705 2215.0492 1078.9207 2213.8907 1078.9707 2212.7207 L 1078.9707 2212.5703 C 1079.6207 2197.1803 1079.7496 2180.8795 1079.8496 2163.0195 C 1079.9696 2143.7497 1079.9609 2122.8 1079.9609 2102 L 1080 2339.8496 L 1080 202 C 1080 186.57814 1080.0103 171.14609 1079.8398 155.37305 C 1079.6692 139.58996 1079.4085 123.43538 1078.666 107.87305 C 1077.9235 92.310708 1076.7189 77.491094 1073.127 64.15625 C 1071.3309 57.493834 1068.9022 51.161567 1065.6914 45.261719 C 1062.4706 39.351841 1057.7857 32.881183 1052.4277 27.533203 C 1031.0259 6.1412555 1003.4327 2.6295284 972.25781 1.1445312 C 956.6754 0.3920028 940.51995 0.2216979 924.7168 0.11132812 C 908.92367 -0.0090416292 893.462 0 878 0 L 202 0 z M 1080 2339.8496 L 842 2340 L 1080 2340 L 1080 2339.8496 z M 238 2340 L 0 2339.8496 L 0 2340 L 238 2340 z</string>
 </resources>
diff --git a/bramble/overlay/packages/apps/Nfc/res/values/config.xml b/bramble/overlay/packages/apps/Nfc/res/values/config.xml
index a157d0f..fe16e58 100644
--- a/bramble/overlay/packages/apps/Nfc/res/values/config.xml
+++ b/bramble/overlay/packages/apps/Nfc/res/values/config.xml
@@ -24,4 +24,15 @@
     <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>
diff --git a/bramble/rro_overlays/NfcOverlay/Android.bp b/bramble/rro_overlays/NfcOverlay/Android.bp
new file mode 100644
index 0000000..24d1c23
--- /dev/null
+++ b/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
+}
diff --git a/bramble/rro_overlays/NfcOverlay/AndroidManifest.xml b/bramble/rro_overlays/NfcOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..5241aa4
--- /dev/null
+++ b/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>
diff --git a/bramble/rro_overlays/NfcOverlay/OWNERS b/bramble/rro_overlays/NfcOverlay/OWNERS
new file mode 100644
index 0000000..35e9713
--- /dev/null
+++ b/bramble/rro_overlays/NfcOverlay/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 48448
+include platform/packages/apps/Nfc:/OWNERS
diff --git a/bramble/rro_overlays/NfcOverlay/res/values/config.xml b/bramble/rro_overlays/NfcOverlay/res/values/config.xml
new file mode 100644
index 0000000..fe16e58
--- /dev/null
+++ b/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>
diff --git a/device-bramble.mk b/device-bramble.mk
index 8d74f1e..a3bf089 100644
--- a/device-bramble.mk
+++ b/device-bramble.mk
@@ -36,7 +36,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/compression_wit
 LOCAL_PATH := device/google/bramble
 
 PRODUCT_SOONG_NAMESPACES += \
-    device/google/bramble
+    device/google/bramble \
+    hardware/qcom/wlan/legacy
 
 DEVICE_PACKAGE_OVERLAYS += device/google/bramble/bramble/overlay
 
@@ -207,3 +208,6 @@ PRODUCT_PACKAGES += \
 # Workaround for Qualcomm neural network HAL
 PRODUCT_PACKAGES += \
     libprotobuf-cpp-full-3.9.1-vendorcompat
+
+PRODUCT_PACKAGES += \
+    NfcOverlayBramble
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 707e302..59037b5 100755
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -498,6 +498,7 @@ static void DumpSensorLog(int fd) {
 
 static void DumpF2FS(int fd) {
     DumpFileToFd(fd, "F2FS", "/sys/kernel/debug/f2fs/status");
+    DumpFileToFd(fd, "F2FS", "/dev/fscklogs/fsck");
     RunCommandToFd(fd, "F2FS - fsck time (ms)", {"/vendor/bin/sh", "-c", "getprop ro.boottime.init.fsck.data"});
     RunCommandToFd(fd, "F2FS - checkpoint=disable time (ms)", {"/vendor/bin/sh", "-c", "getprop ro.boottime.init.mount.data"});
 }
diff --git a/init.recovery.device.rc b/init.recovery.device.rc
index 7df16ec..596e813 100644
--- a/init.recovery.device.rc
+++ b/init.recovery.device.rc
@@ -3,6 +3,7 @@ on fs
     symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice
 
 on init
+    wait /sys/devices/platform/soc/a600000.ssusb/a600000.dwc3/driver 10
     setprop sys.usb.configfs 1
     # Don't lose recovery logs- keep warm reset for coming out of recovery.
     write /sys/module/msm_poweroff/parameters/warm_reset 1
diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp
index 1c5d151..df850ee 100644
--- a/usb/usb/Android.bp
+++ b/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",
     ],
 }
diff --git a/vibrator/drv2624/bench/Android.bp b/vibrator/drv2624/bench/Android.bp
index 1ce0641..a203771 100644
--- a/vibrator/drv2624/bench/Android.bp
+++ b/vibrator/drv2624/bench/Android.bp
@@ -14,6 +14,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_pixel_system_sw_touch_haptic",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/vibrator/drv2624/tests/Android.bp b/vibrator/drv2624/tests/Android.bp
index f4e3ac5..252cf81 100644
--- a/vibrator/drv2624/tests/Android.bp
+++ b/vibrator/drv2624/tests/Android.bp
@@ -14,6 +14,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_pixel_system_sw_touch_haptic",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }