Merge Android 14

Bug: 298295554
Merged-In: Icc310923f39dfb56a621fe507f0233d76b3e68e0
Change-Id: Iaaa2c9608b359704ae0a22570b632af3ad8b2284

9 files changed, 39 insertions, 14 deletions

diff --git a/coral/BoardConfig.mk b/coral/BoardConfig.mk
index 91348aac..6b3043ce 100644
--- a/coral/BoardConfig.mk
+++ b/coral/BoardConfig.mk
@@ -14,8 +14,11 @@
 # 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 := coral
   TARGET_SCREEN_DENSITY := 560
diff --git a/coral/overlay/frameworks/base/core/res/res/values/config.xml b/coral/overlay/frameworks/base/core/res/res/values/config.xml
index a46c63e4..cd42e6d3 100755
--- a/coral/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/coral/overlay/frameworks/base/core/res/res/values/config.xml
@@ -201,6 +201,16 @@
     <!-- default refresh rate in the zone defined by birghtness and ambient thresholds -->
     <integer name="config_defaultRefreshRateInZone">90</integer>
 
-    <!-- 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 226 0 C 226 2.2204438e-16 173.72759 1.0724993 164.76953 1.171875 C 155.81149 1.2712508 143.58445 1.376508 134.61133 1.9238281 C 125.63821 2.4711484 121.91397 2.9695214 115.18359 4.0058594 C 108.45322 5.0421975 102.29142 6.3341279 94.933594 8.6777344 C 87.575769 11.021341 81.490929 13.052709 71.300781 18.392578 C 61.110632 23.732448 49.308865 31.589821 41.310547 39.449219 C 33.312229 47.308617 25.812372 56.991263 20.037109 67.207031 C 14.261848 77.422799 10.39904 88.853073 7.0507812 100.18164 C 5.24107 106.30463 4.4224357 111.80729 3.5488281 117.92188 C 3.5451181 117.94776 3.5400574 117.974 3.5371094 118 C 2.8635892 123.94796 2.5831894 126.53665 2.0351562 135.89453 C 1.4871232 145.25241 0.93130251 163.31481 0.76171875 174.1582 L 0 226 L 0 2814 L 0.76171875 2865.8418 C 0.93130841 2876.6852 1.4871274 2894.7476 2.0351562 2904.1055 C 2.5831952 2913.4634 2.8635906 2916.052 3.5371094 2922 C 3.5402094 2922.026 3.5448281 2922.0521 3.5488281 2922.0781 C 4.4224365 2928.1927 5.241065 2933.6954 7.0507812 2939.8184 C 10.399035 2951.1468 14.261851 2962.5772 20.037109 2972.793 C 25.812369 2983.0088 33.312233 2992.6913 41.310547 3000.5508 C 49.308871 3008.4102 61.110631 3016.2675 71.300781 3021.6074 C 81.490921 3026.9473 87.575768 3028.9787 94.933594 3031.3223 C 102.29142 3033.666 108.45322 3034.9578 115.18359 3035.9941 C 121.91397 3037.0304 125.63821 3037.5289 134.61133 3038.0762 C 143.58445 3038.6235 155.81147 3038.7291 164.76953 3038.8281 C 173.72761 3038.9275 226 3040 226 3040 L 1214 3040 C 1214 3040 1266.2724 3038.9275 1275.2305 3038.8281 C 1284.1886 3038.7291 1296.4155 3038.6235 1305.3887 3038.0762 C 1314.3618 3037.5289 1318.088 3037.0304 1324.8184 3035.9941 C 1331.5488 3034.9578 1337.7085 3033.666 1345.0664 3031.3223 C 1352.4242 3028.9787 1358.509 3026.9473 1368.6992 3021.6074 C 1378.8894 3016.2675 1390.6911 3008.4102 1398.6895 3000.5508 C 1406.6876 2992.6913 1414.1876 2983.0088 1419.9629 2972.793 C 1425.7381 2962.5772 1429.6009 2951.1468 1432.9492 2939.8184 C 1434.7589 2933.6954 1435.5776 2928.1927 1436.4512 2922.0781 C 1436.4512 2922.0521 1436.4619 2922.026 1436.4629 2922 C 1437.1365 2916.052 1437.4167 2913.4634 1437.9648 2904.1055 C 1438.5128 2894.7476 1439.0687 2876.6852 1439.2383 2865.8418 L 1440 2814 L 1440 226 L 1439.2383 174.1582 C 1439.0687 163.31481 1438.5128 145.25241 1437.9648 135.89453 C 1437.4167 126.53665 1437.1364 123.94796 1436.4629 118 C 1436.4619 117.974 1436.4512 117.94776 1436.4512 117.92188 C 1435.5776 111.80729 1434.7589 106.30463 1432.9492 100.18164 C 1429.6009 88.853072 1425.7382 77.422801 1419.9629 67.207031 C 1414.1877 56.991261 1406.6876 47.308623 1398.6895 39.449219 C 1390.6911 31.589825 1378.8893 23.732448 1368.6992 18.392578 C 1358.509 13.052708 1352.4243 11.021337 1345.0664 8.6777344 C 1337.7086 6.334128 1331.5487 5.0421982 1324.8184 4.0058594 C 1318.088 2.9695224 1314.3619 2.4711481 1305.3887 1.9238281 C 1296.4156 1.3765083 1284.1886 1.2712548 1275.2305 1.171875 C 1266.2724 1.0724992 1214 0 1214 0 L 226 0 z</string>
 </resources>
diff --git a/default-permissions.xml b/default-permissions.xml
index b36e45d6..7bcffcff 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -54,8 +54,6 @@
         <permission name="android.permission.READ_CALL_LOG" fixed="false"/>
         <permission name="android.permission.WRITE_CALL_LOG" fixed="false"/>
         <!-- Used to set up a Wi-Fi P2P network -->
-        <!-- TODO(b/231966826): Remove the location permission after Restore targets to T. -->
-        <permission name="android.permission.ACCESS_FINE_LOCATION" fixed="false"/>
         <permission name="android.permission.NEARBY_WIFI_DEVICES" fixed="false"/>
         <!-- Notifications -->
         <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
diff --git a/device.mk b/device.mk
index 831fd4c8..0e40ffcc 100644
--- a/device.mk
+++ b/device.mk
@@ -600,7 +600,7 @@ endif
 
 # Wifi
 PRODUCT_PACKAGES += \
-    android.hardware.wifi@1.0-service \
+    android.hardware.wifi-service \
     wificond \
     libwpa_client \
     WifiOverlay
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index f9d0083c..d731591d 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -211,9 +211,9 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
+    <hal format="aidl" optional="true">
         <name>vendor.google.wifi_ext</name>
-        <version>1.3</version>
+        <version>1</version>
         <interface>
             <name>IWifiExt</name>
             <instance>default</instance>
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index f5b45836..99845e37 100755
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -480,6 +480,7 @@ static void DumpDisplay(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/flame/BoardConfig.mk b/flame/BoardConfig.mk
index 347e2846..853f0260 100644
--- a/flame/BoardConfig.mk
+++ b/flame/BoardConfig.mk
@@ -14,8 +14,11 @@
 # 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 := flame
   TARGET_SCREEN_DENSITY := 440
diff --git a/flame/overlay/frameworks/base/core/res/res/values/config.xml b/flame/overlay/frameworks/base/core/res/res/values/config.xml
index 735553d9..f899eabf 100755
--- a/flame/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/flame/overlay/frameworks/base/core/res/res/values/config.xml
@@ -189,6 +189,16 @@
     <!-- default refresh rate in the zone defined by birghtness and ambient thresholds -->
     <integer name="config_defaultRefreshRateInZone">60</integer>
 
-    <!-- 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 176 0 C 176 -2.2204438e-16 134.19052 1.1818607 128.69141 1.46875 C 123.19228 1.7556393 117.65841 1.9965153 113.88867 2.2578125 C 110.11895 2.5191097 105.56582 2.9299783 100.31445 3.5039062 C 95.710876 4.0070376 91.783518 4.7249323 86.292969 5.7949219 C 80.802417 6.8649114 76.860487 7.8260947 70.939453 9.8847656 C 65.018419 11.943436 56.749302 15.819698 52.25 18.416016 C 47.750698 21.012332 46.3587 22.205045 43.306641 24.523438 C 40.254582 26.841829 36.877746 29.609554 34.15625 32.375 C 32.794062 33.759186 29.843069 36.728514 27.386719 39.607422 C 24.935557 42.480247 22.575747 45.860889 20.744141 48.578125 C 15.521876 56.325493 12.241957 64.091784 10.417969 69.162109 C 8.5939798 74.232434 7.5118872 78.803584 6.3710938 83.320312 C 5.2303002 87.837042 4.2159768 93.315337 3.5039062 98.449219 C 2.7918358 103.58309 2.5895833 109.52778 2.1699219 114.78711 C 1.7466386 120.09181 1.6009942 128.15059 1.2558594 135.11914 C 0.77835153 144.76041 0 176 0 176 L 0 2104 C 2.9605918e-16 2104 0.7783503 2135.2397 1.2558594 2144.8809 C 1.6009886 2151.8495 1.7466427 2159.9082 2.1699219 2165.2129 C 2.5895911 2170.4722 2.7918278 2176.4169 3.5039062 2181.5508 C 4.2159748 2186.6847 5.230306 2192.1629 6.3710938 2196.6797 C 7.5118914 2201.1964 8.5939817 2205.7675 10.417969 2210.8379 C 12.241955 2215.9082 15.521871 2223.6746 20.744141 2231.4219 C 22.575747 2234.1392 24.935553 2237.5198 27.386719 2240.3926 C 29.843063 2243.2715 32.794062 2246.2408 34.15625 2247.625 C 36.877744 2250.3905 40.254587 2253.1582 43.306641 2255.4766 C 46.358705 2257.795 47.750698 2258.9876 52.25 2261.584 C 56.749302 2264.1803 65.018415 2268.0565 70.939453 2270.1152 C 76.860491 2272.1739 80.802419 2273.1351 86.292969 2274.2051 C 91.783517 2275.2751 95.710877 2275.9929 100.31445 2276.4961 C 105.56582 2277.07 110.11895 2277.4809 113.88867 2277.7422 C 117.65841 2278.0035 123.19228 2278.2445 128.69141 2278.5312 C 134.19052 2278.8181 176 2280 176 2280 L 904 2280 C 904 2280 945.80948 2278.8181 951.30859 2278.5312 C 956.80772 2278.2445 962.34159 2278.0035 966.11133 2277.7422 C 969.88105 2277.4809 974.43418 2277.07 979.68555 2276.4961 C 984.28912 2275.9929 988.21649 2275.2751 993.70703 2274.2051 C 999.19759 2273.1351 1003.1396 2272.1739 1009.0605 2270.1152 C 1014.9815 2268.0565 1023.2507 2264.1803 1027.75 2261.584 C 1032.2493 2258.9876 1033.6414 2257.795 1036.6934 2255.4766 C 1039.7455 2253.1582 1043.1223 2250.3905 1045.8438 2247.625 C 1047.2057 2246.2408 1050.157 2243.2715 1052.6133 2240.3926 C 1055.0645 2237.5198 1057.4243 2234.1392 1059.2559 2231.4219 C 1064.4782 2223.6746 1067.7581 2215.9082 1069.582 2210.8379 C 1071.406 2205.7675 1072.4881 2201.1964 1073.6289 2196.6797 C 1074.7697 2192.1629 1075.784 2186.6847 1076.4961 2181.5508 C 1077.2082 2176.4169 1077.4104 2170.4722 1077.8301 2165.2129 C 1078.2534 2159.9082 1078.399 2151.8495 1078.7441 2144.8809 C 1079.2216 2135.2397 1080 2104 1080 2104 L 1080 176 C 1080 176 1079.2216 144.76041 1078.7441 135.11914 C 1078.3989 128.15059 1078.2534 120.09181 1077.8301 114.78711 C 1077.4104 109.52778 1077.2082 103.58309 1076.4961 98.449219 C 1075.784 93.315336 1074.7697 87.837042 1073.6289 83.320312 C 1072.4881 78.803584 1071.406 74.232434 1069.582 69.162109 C 1067.758 64.091784 1064.4782 56.325493 1059.2559 48.578125 C 1057.4243 45.860889 1055.0645 42.480247 1052.6133 39.607422 C 1050.157 36.728513 1047.2058 33.759186 1045.8438 32.375 C 1043.1223 29.609554 1039.7455 26.841829 1036.6934 24.523438 C 1033.6413 22.205045 1032.2493 21.012332 1027.75 18.416016 C 1023.2507 15.819699 1014.9815 11.943436 1009.0605 9.8847656 C 1003.1396 7.8260947 999.19759 6.8649117 993.70703 5.7949219 C 988.21648 4.7249319 984.28912 4.0070372 979.68555 3.5039062 C 974.43418 2.9299784 969.88105 2.5191099 966.11133 2.2578125 C 962.34159 1.9965151 956.80772 1.7556394 951.30859 1.46875 C 945.80948 1.1818606 904 0 904 0 L 176 0 z</string>
 </resources>
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index c7fb1e9a..ccfb53d4 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -52,7 +52,7 @@
 
     <!-- True if the firmware supports connected MAC randomization -->
     <bool name="config_wifi_connected_mac_randomization_supported">true</bool>
-
+    <bool name="config_wifiAllowNonPersistentMacRandomizationOnOpenSsids">true</bool>
     <!-- True if the firmware supports p2p MAC randomization -->
     <bool name="config_wifi_p2p_mac_randomization_supported">true</bool>