Snap for 11819167 from fc7c341f3b519d8a00d6a05a7a2c1bfb93fc82a7 to busytown-mac-infra-releasebusytown-mac-infra-release

Change-Id: I3db96ba6625f7079497d9a8ddd9ff41b28101edb

30 files changed, 1035 insertions, 70 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index c0701df..c37ea7a 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -17,20 +17,22 @@
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/bluejay_car/aosp_bluejay_car.mk \
     $(LOCAL_DIR)/bramble_car/aosp_bramble_car.mk \
-    $(LOCAL_DIR)/coral_car/aosp_coral_car.mk \
-    $(LOCAL_DIR)/flame_car/aosp_flame_car.mk \
+    $(LOCAL_DIR)/cheetah_car/aosp_cheetah_car.mk \
     $(LOCAL_DIR)/oriole_car/aosp_oriole_car.mk \
+    $(LOCAL_DIR)/panther_car/aosp_panther_car.mk \
     $(LOCAL_DIR)/raven_car/aosp_raven_car.mk \
     $(LOCAL_DIR)/redfin_car/aosp_redfin_car.mk \
-    $(LOCAL_DIR)/sunfish_car/aosp_sunfish_car.mk
+    $(LOCAL_DIR)/sunfish_car/aosp_sunfish_car.mk \
+    $(LOCAL_DIR)/tangorpro_car/aosp_tangorpro_car.mk
 
 
 COMMON_LUNCH_CHOICES := \
-    aosp_bluejay_car-userdebug \
-    aosp_bramble_car-userdebug \
-    aosp_coral_car-userdebug \
-    aosp_flame_car-userdebug \
-    aosp_oriole_car-userdebug \
-    aosp_raven_car-userdebug \
-    aosp_redfin_car-userdebug \
-    aosp_sunfish_car-userdebug
+    aosp_bluejay_car-trunk_staging-userdebug \
+    aosp_bramble_car-trunk_staging-userdebug \
+    aosp_cheetah_car-trunk_staging-userdebug \
+    aosp_oriole_car-trunk_staging-userdebug \
+    aosp_panther_car-trunk_staging-userdebug \
+    aosp_raven_car-trunk_staging-userdebug \
+    aosp_redfin_car-trunk_staging-userdebug \
+    aosp_sunfish_car-trunk_staging-userdebug \
+    aosp_tangorpro_car-trunk_staging-userdebug
diff --git a/OWNERS b/OWNERS
index fbf399d..3d821f6 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,4 @@
 sgaurav@google.com
-felipeal@google.com
+nirajdesai@google.com
+chengandrew@google.com
+calhuang@google.com
diff --git a/bluejay_car/BoardConfig.mk b/bluejay_car/BoardConfig.mk
index 123fca7..8a09d9a 100644
--- a/bluejay_car/BoardConfig.mk
+++ b/bluejay_car/BoardConfig.mk
@@ -19,4 +19,4 @@
 #
 # * TARGET_SCREEN_DENSITY is scaled down by 1.75x
 
-TARGET_SCREEN_DENSITY := 240
+TARGET_SCREEN_DENSITY ?= 240
diff --git a/bramble_car/device-bramble-car.mk b/bramble_car/device-bramble-car.mk
index 58e081a..f1e5096 100644
--- a/bramble_car/device-bramble-car.mk
+++ b/bramble_car/device-bramble-car.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-PHONE_CAR_BOARD_PRODUCT := bramble_car
+AUTOMOTIVE_PRODUCT_PATH := google_car/bramble_car
 
 $(call inherit-product, packages/services/Car/car_product/build/car.mk)
 
diff --git a/cheetah_car/aosp_cheetah_car.mk b/cheetah_car/aosp_cheetah_car.mk
new file mode 100644
index 0000000..73df691
--- /dev/null
+++ b/cheetah_car/aosp_cheetah_car.mk
@@ -0,0 +1,33 @@
+#
+# Copyright 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.
+#
+
+DEVICE_IS_64BIT_ONLY := true
+
+PRODUCT_PACKAGE_OVERLAYS += device/google_car/cheetah_car/overlay
+
+PRODUCT_COPY_FILES += \
+    device/google_car/cheetah_car/displayconfig/display_id_4619827677550801152.xml:$(TARGET_COPY_OUT_VENDOR)/etc/displayconfig/display_id_4619827677550801152.xml
+
+$(call inherit-product, device/google_car/common/pre_google_car.mk)
+$(call inherit-product, device/google_car/cheetah_car/device-cheetah-car.mk)
+$(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/cheetah/device-vendor-cheetah.mk)
+$(call inherit-product, device/google_car/common/post_google_car.mk)
+
+PRODUCT_NAME := aosp_cheetah_car
+PRODUCT_DEVICE := cheetah
+PRODUCT_MODEL := AOSP on Cheetah
+PRODUCT_BRAND := Android
+PRODUCT_MANUFACTURER := Google
diff --git a/flame_car/device-flame-car.mk b/cheetah_car/device-cheetah-car.mk
index 28d0314..abcddeb 100644
--- a/flame_car/device-flame-car.mk
+++ b/cheetah_car/device-cheetah-car.mk
@@ -1,5 +1,5 @@
 #
-# Copyright 2020 The Android Open Source Project
+# Copyright 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.
@@ -14,8 +14,14 @@
 # limitations under the License.
 #
 
-PHONE_CAR_BOARD_PRODUCT := flame_car
-
 $(call inherit-product, packages/services/Car/car_product/build/car.mk)
 
-$(call inherit-product, device/google/coral/device-flame.mk)
+$(call inherit-product, device/google/pantah/device-cheetah.mk)
+
+include device/google/gs101/uwb/uwb.mk
+
+PRODUCT_PRODUCT_PROPERTIES+= \
+    ro.adb.secure=0
+
+PRODUCT_PACKAGES += \
+    librs_jni
diff --git a/cheetah_car/displayconfig/display_id_4619827677550801152.xml b/cheetah_car/displayconfig/display_id_4619827677550801152.xml
new file mode 100644
index 0000000..0318cde
--- /dev/null
+++ b/cheetah_car/displayconfig/display_id_4619827677550801152.xml
@@ -0,0 +1,599 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+
+<!-- Copyright (C) 2023 Google Inc.
+
+    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.
+-->
+
+<!-- This overrides <height> from 1440 to 2520 and <width> from 3120 to 5460 for phone_car
+    configuration. The original file is located at:
+
+    vendor/google_devices/pantah/proprietary/cheetah/vendor/etc/displayconfig/display_id_4619827677550801152.xml
+-->
+
+<displayConfiguration>
+    <screenBrightnessMap>
+        <point>
+            <value>0.0</value>
+            <nits>2.0</nits>
+        </point>
+        <point>
+            <value>0.6</value>
+            <nits>600.0</nits>
+        </point>
+        <point>
+            <value>1.0</value>
+            <nits>1000.0</nits>
+        </point>
+    </screenBrightnessMap>
+
+    <highBrightnessMode enabled="true">
+        <transitionPoint>0.6</transitionPoint>
+        <minimumLux>5724.62401237</minimumLux>
+        <timing>
+            <!-- allow for 5 minutes out of every 30 minutes -->
+            <timeWindowSecs>1800</timeWindowSecs>
+            <timeMaxSecs>300</timeMaxSecs>
+            <timeMinSecs>60</timeMinSecs>
+        </timing>
+        <thermalStatusLimit>light</thermalStatusLimit>
+        <allowInLowPowerMode>false</allowInLowPowerMode>
+        <minimumHdrPercentOfScreen>0</minimumHdrPercentOfScreen>
+        <!--sdrHdrRatioMap, backed by spline, must have at least two entries -->
+        <sdrHdrRatioMap>
+            <point>
+                <sdrNits>2.000</sdrNits>
+                <hdrRatio>8.000</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>75.000</sdrNits>
+                <hdrRatio>7.987</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>78.859</sdrNits>
+                <hdrRatio>7.596</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>82.717</sdrNits>
+                <hdrRatio>7.242</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>86.576</sdrNits>
+                <hdrRatio>6.919</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>90.434</sdrNits>
+                <hdrRatio>6.624</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>94.293</sdrNits>
+                <hdrRatio>6.353</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>98.152</sdrNits>
+                <hdrRatio>6.103</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>102.010</sdrNits>
+                <hdrRatio>5.872</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>105.869</sdrNits>
+                <hdrRatio>5.658</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>109.727</sdrNits>
+                <hdrRatio>5.459</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>113.586</sdrNits>
+                <hdrRatio>5.274</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>117.444</sdrNits>
+                <hdrRatio>5.100</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>121.303</sdrNits>
+                <hdrRatio>4.938</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>125.162</sdrNits>
+                <hdrRatio>4.786</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>129.020</sdrNits>
+                <hdrRatio>4.643</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>132.879</sdrNits>
+                <hdrRatio>4.508</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>136.737</sdrNits>
+                <hdrRatio>4.381</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>140.596</sdrNits>
+                <hdrRatio>4.260</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>144.455</sdrNits>
+                <hdrRatio>4.147</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>148.313</sdrNits>
+                <hdrRatio>4.039</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>152.172</sdrNits>
+                <hdrRatio>3.936</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>156.030</sdrNits>
+                <hdrRatio>3.839</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>159.889</sdrNits>
+                <hdrRatio>3.746</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>163.747</sdrNits>
+                <hdrRatio>3.658</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>167.606</sdrNits>
+                <hdrRatio>3.574</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>171.465</sdrNits>
+                <hdrRatio>3.493</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>175.323</sdrNits>
+                <hdrRatio>3.417</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>179.182</sdrNits>
+                <hdrRatio>3.343</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>183.040</sdrNits>
+                <hdrRatio>3.273</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>186.899</sdrNits>
+                <hdrRatio>3.205</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>190.758</sdrNits>
+                <hdrRatio>3.140</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>194.616</sdrNits>
+                <hdrRatio>3.078</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>198.475</sdrNits>
+                <hdrRatio>3.018</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>202.333</sdrNits>
+                <hdrRatio>2.960</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>206.192</sdrNits>
+                <hdrRatio>2.905</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>210.051</sdrNits>
+                <hdrRatio>2.852</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>213.909</sdrNits>
+                <hdrRatio>2.800</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>217.768</sdrNits>
+                <hdrRatio>2.751</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>221.626</sdrNits>
+                <hdrRatio>2.703</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>225.485</sdrNits>
+                <hdrRatio>2.656</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>229.343</sdrNits>
+                <hdrRatio>2.612</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>233.202</sdrNits>
+                <hdrRatio>2.569</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>237.061</sdrNits>
+                <hdrRatio>2.527</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>240.919</sdrNits>
+                <hdrRatio>2.486</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>244.778</sdrNits>
+                <hdrRatio>2.447</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>248.636</sdrNits>
+                <hdrRatio>2.409</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>252.495</sdrNits>
+                <hdrRatio>2.372</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>256.354</sdrNits>
+                <hdrRatio>2.337</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>260.212</sdrNits>
+                <hdrRatio>2.302</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>264.071</sdrNits>
+                <hdrRatio>2.268</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>267.929</sdrNits>
+                <hdrRatio>2.236</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>271.788</sdrNits>
+                <hdrRatio>2.204</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>275.646</sdrNits>
+                <hdrRatio>2.173</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>279.505</sdrNits>
+                <hdrRatio>2.143</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>283.364</sdrNits>
+                <hdrRatio>2.114</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>287.222</sdrNits>
+                <hdrRatio>2.085</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>291.081</sdrNits>
+                <hdrRatio>2.058</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>294.939</sdrNits>
+                <hdrRatio>2.031</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>298.798</sdrNits>
+                <hdrRatio>2.005</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>302.657</sdrNits>
+                <hdrRatio>1.979</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>306.515</sdrNits>
+                <hdrRatio>1.954</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>310.374</sdrNits>
+                <hdrRatio>1.930</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>314.232</sdrNits>
+                <hdrRatio>1.906</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>318.091</sdrNits>
+                <hdrRatio>1.883</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>321.949</sdrNits>
+                <hdrRatio>1.861</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>325.808</sdrNits>
+                <hdrRatio>1.839</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>329.667</sdrNits>
+                <hdrRatio>1.817</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>333.525</sdrNits>
+                <hdrRatio>1.796</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>337.384</sdrNits>
+                <hdrRatio>1.775</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>341.242</sdrNits>
+                <hdrRatio>1.755</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>345.101</sdrNits>
+                <hdrRatio>1.736</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>348.960</sdrNits>
+                <hdrRatio>1.717</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>352.818</sdrNits>
+                <hdrRatio>1.698</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>356.677</sdrNits>
+                <hdrRatio>1.679</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>360.535</sdrNits>
+                <hdrRatio>1.661</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>364.394</sdrNits>
+                <hdrRatio>1.644</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>368.253</sdrNits>
+                <hdrRatio>1.627</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>372.111</sdrNits>
+                <hdrRatio>1.610</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>375.970</sdrNits>
+                <hdrRatio>1.593</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>379.828</sdrNits>
+                <hdrRatio>1.577</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>383.687</sdrNits>
+                <hdrRatio>1.561</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>387.545</sdrNits>
+                <hdrRatio>1.546</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>391.404</sdrNits>
+                <hdrRatio>1.530</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>395.263</sdrNits>
+                <hdrRatio>1.515</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>399.121</sdrNits>
+                <hdrRatio>1.501</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>402.980</sdrNits>
+                <hdrRatio>1.486</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>406.838</sdrNits>
+                <hdrRatio>1.472</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>410.697</sdrNits>
+                <hdrRatio>1.458</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>414.556</sdrNits>
+                <hdrRatio>1.445</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>418.414</sdrNits>
+                <hdrRatio>1.432</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>422.273</sdrNits>
+                <hdrRatio>1.419</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>426.131</sdrNits>
+                <hdrRatio>1.406</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>429.990</sdrNits>
+                <hdrRatio>1.393</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>433.848</sdrNits>
+                <hdrRatio>1.381</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>437.707</sdrNits>
+                <hdrRatio>1.368</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>441.566</sdrNits>
+                <hdrRatio>1.357</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>445.424</sdrNits>
+                <hdrRatio>1.345</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>449.283</sdrNits>
+                <hdrRatio>1.333</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>453.141</sdrNits>
+                <hdrRatio>1.322</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>457.000</sdrNits>
+                <hdrRatio>1.311</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>464.526</sdrNits>
+                <hdrRatio>1.335</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>472.053</sdrNits>
+                <hdrRatio>1.358</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>479.579</sdrNits>
+                <hdrRatio>1.381</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>487.105</sdrNits>
+                <hdrRatio>1.403</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>494.632</sdrNits>
+                <hdrRatio>1.424</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>502.158</sdrNits>
+                <hdrRatio>1.445</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>509.684</sdrNits>
+                <hdrRatio>1.465</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>517.211</sdrNits>
+                <hdrRatio>1.485</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>524.737</sdrNits>
+                <hdrRatio>1.504</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>532.263</sdrNits>
+                <hdrRatio>1.522</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>539.789</sdrNits>
+                <hdrRatio>1.540</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>547.316</sdrNits>
+                <hdrRatio>1.557</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>554.842</sdrNits>
+                <hdrRatio>1.574</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>562.368</sdrNits>
+                <hdrRatio>1.591</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>569.895</sdrNits>
+                <hdrRatio>1.607</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>577.421</sdrNits>
+                <hdrRatio>1.622</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>584.947</sdrNits>
+                <hdrRatio>1.637</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>592.474</sdrNits>
+                <hdrRatio>1.652</hdrRatio>
+            </point>
+            <point>
+                <sdrNits>600.000</sdrNits>
+                <hdrRatio>1.667</hdrRatio>
+            </point>
+        </sdrHdrRatioMap>
+    </highBrightnessMode>
+
+    <densityMapping>
+        <density>
+            <height>2520</height>
+            <width>5460</width>
+            <density>560</density>
+        </density>
+    </densityMapping>
+
+    <screenBrightnessRampIncreaseMaxMillis>2000</screenBrightnessRampIncreaseMaxMillis>
+
+    <ambientBrightnessChangeThresholds>
+        <brighteningThresholds>
+            <minimum>10</minimum>
+        </brighteningThresholds>
+        <darkeningThresholds>
+            <minimum>0</minimum>
+        </darkeningThresholds>
+    </ambientBrightnessChangeThresholds>
+
+    <ambientLightHorizonLong>5000</ambientLightHorizonLong>
+    <ambientLightHorizonShort>50</ambientLightHorizonShort>
+
+    <thermalThrottling>
+        <brightnessThrottlingMap>
+            <brightnessThrottlingPoint>
+                <thermalStatus>light</thermalStatus>
+                <!-- Throttling to 465 nits: (465-2.0)/(600-2.0)*(0.6-0.0)+0.0 = 0.464548495 -->
+                <brightness>0.464548495</brightness>
+            </brightnessThrottlingPoint>
+            <brightnessThrottlingPoint>
+                <thermalStatus>moderate</thermalStatus>
+                <!-- Throttling to 297 nits: (297-2.0)/(600-2.0)*(0.6-0.0)+0.0 = 0.295986622 -->
+                <brightness>0.295986622</brightness>
+            </brightnessThrottlingPoint>
+            <brightnessThrottlingPoint>
+                <thermalStatus>severe</thermalStatus>
+                <!-- Throttling to 213 nits: (213-2.0)/(600-2.0)*(0.6-0.0)+0.0 = 0.211705686 -->
+                <brightness>0.211705686</brightness>
+            </brightnessThrottlingPoint>
+            <brightnessThrottlingPoint>
+                <thermalStatus>critical</thermalStatus>
+                <!-- Throttling to 150 nits: (150-2.0)/(600-2.0)*(0.6-0.0)+0.0 = 0.148494983 -->
+                <brightness>0.148494983</brightness>
+            </brightnessThrottlingPoint>
+        </brightnessThrottlingMap>
+    </thermalThrottling>
+
+    <screenBrightnessRampFastDecrease>0.7047244</screenBrightnessRampFastDecrease>
+    <screenBrightnessRampFastIncrease>0.7047244</screenBrightnessRampFastIncrease>
+    <screenBrightnessRampSlowDecrease>0.05</screenBrightnessRampSlowDecrease>
+    <screenBrightnessRampSlowIncrease>0.05</screenBrightnessRampSlowIncrease>
+
+    <screenOffBrightnessSensor>
+        <type>com.google.sensor.binned_brightness</type>
+    </screenOffBrightnessSensor>
+    <screenOffBrightnessSensorValueToLux>
+        <item>-1</item> <!-- 0: OFF -->
+        <item>0</item>  <!-- 1: NIGHT -->
+        <item>5</item>  <!-- 2: LOW -->
+        <item>80</item> <!-- 3: HIGH -->
+        <item>1500</item> <!-- 4: SUN -->
+    </screenOffBrightnessSensorValueToLux>
+</displayConfiguration>
diff --git a/cheetah_car/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/cheetah_car/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
new file mode 100644
index 0000000..971d192
--- /dev/null
+++ b/cheetah_car/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -0,0 +1,21 @@
+<?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.
+ */
+-->
+<resources>
+    <integer name="def_user_rotation">1</integer>
+</resources>
diff --git a/common/Android.mk b/common/Android.mk
deleted file mode 100644
index 2ca707a..0000000
--- a/common/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-$(eval $(call declare-1p-copy-files,device/google_car/common,))
diff --git a/common/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/common/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index 659b801..9e709d2 100644
--- a/common/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/common/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -18,4 +18,5 @@
 -->
 <resources>
     <integer name="def_user_rotation">1</integer>
+    <integer name="def_screen_off_timeout">6000000</integer>
 </resources>
diff --git a/common/post_google_car.mk b/common/post_google_car.mk
index 24df3d4..beea48c 100644
--- a/common/post_google_car.mk
+++ b/common/post_google_car.mk
@@ -20,8 +20,13 @@
 
 # Auto modules
 PRODUCT_PACKAGES += \
-            android.hardware.automotive.audiocontrol-service.example \
-            android.hardware.automotive.can@1.0-service
+            android.hardware.automotive.audiocontrol-service.example
+
+ifneq ($(PIXEL_2023_GEN),)
+    PRODUCT_PACKAGES += android.hardware.automotive.can
+else
+    PRODUCT_PACKAGES += android.hardware.automotive.can@1.0-service
+endif
 
 PRODUCT_PACKAGES_DEBUG += \
             canhalctrl \
@@ -47,7 +52,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
         log.tag.CarTrustAgentUnlockEvent=I
 
 # Phone car targets don't support ramdump
-EXCLUDE_BUILD_RAMDUMP_UPLOADER_DEBUG_TOOL := true
+PRODUCT_PACKAGES += \
+    ExcludeRamdumpUploader
 
 # Disable RCS and EAB for phone car targets
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -55,7 +61,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
         persist.eab.supported=0
 
 # Explicitly disable support for some Bluetooth profiles included in base phone builds
-PRODUCT_PRODUCT_PROPERTIES += \
+PRODUCT_PROPERTY_OVERRIDES += \
         bluetooth.profile.asha.central.enabled=false \
         bluetooth.profile.a2dp.source.enabled=false \
         bluetooth.profile.avrcp.target.enabled=false \
diff --git a/common/pre_google_car.mk b/common/pre_google_car.mk
index 7cb6379..5c5972f 100644
--- a/common/pre_google_car.mk
+++ b/common/pre_google_car.mk
@@ -18,6 +18,9 @@
 #### This file should be included at the top of the aosp_PHONE_car.mk file
 ####
 
+# CarServiceHelperService accesses the hidden api in the system server.
+SYSTEM_OPTIMIZE_JAVA := false
+
 DEVICE_FRAMEWORK_MANIFEST_FILE += device/google_car/common/manifest.xml
 
 # generic_system.mk sets 'PRODUCT_ENFORCE_RRO_TARGETS := *'
@@ -27,6 +30,10 @@ PRODUCT_ENFORCE_RRO_TARGETS :=
 # Enable mainline checking
 PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := false
 
+# Set Car Service RRO
+PRODUCT_PACKAGES += CarServiceOverlayPhoneCar
+GOOGLE_CAR_SERVICE_OVERLAY += CarServiceOverlayPhoneCarGoogle
+
 # All components inherited here go to system image
 # Skip this for 64 bit only devices
 ifneq ($(DEVICE_IS_64BIT_ONLY),true)
@@ -46,9 +53,16 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
 
 # Auto modules
-PRODUCT_PACKAGES += \
-            android.hardware.broadcastradio@2.0-service \
-            android.hardware.automotive.vehicle@2.0-default-service
+
+ifneq ($(PIXEL_2023_GEN),)
+    PRODUCT_PACKAGES += \
+        android.hardware.broadcastradio \
+        android.hardware.automotive.vehicle@V3-default-service
+else
+    PRODUCT_PACKAGES += \
+        android.hardware.broadcastradio@2.0-service \
+        android.hardware.automotive.vehicle@2.0-default-service
+endif
 
 # Additional selinux policy
 BOARD_SEPOLICY_DIRS += device/google_car/common/sepolicy
@@ -64,9 +78,11 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 PRODUCT_PACKAGE_OVERLAYS += device/google_car/common/overlay
 
-# Enable landscape
-PRODUCT_COPY_FILES += \
+ifneq ($(PORTRAIT_UI), true)
+        # Enable landscape
+        PRODUCT_COPY_FILES += \
             frameworks/native/data/etc/android.hardware.screen.landscape.xml:system/etc/permissions/android.hardware.screen.landscape.xml
+endif
 
 
 TARGET_USES_CAR_FUTURE_FEATURES := true
diff --git a/common/rro_overlays/CarServiceOverlay/Android.bp b/common/rro_overlays/CarServiceOverlay/Android.bp
new file mode 100644
index 0000000..2c1a60d
--- /dev/null
+++ b/common/rro_overlays/CarServiceOverlay/Android.bp
@@ -0,0 +1,27 @@
+// 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.
+//
+//
+
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "CarServiceOverlayPhoneCar",
+    resource_dirs: ["res"],
+    manifest: "AndroidManifest.xml",
+    sdk_version: "current",
+    product_specific: true
+}
diff --git a/common/rro_overlays/CarServiceOverlay/AndroidManifest.xml b/common/rro_overlays/CarServiceOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..2d19a04
--- /dev/null
+++ b/common/rro_overlays/CarServiceOverlay/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<?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.
+  -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.android.car.resources.google_car">
+    <application android:hasCode="false"/>
+    <overlay android:priority="2001"
+             android:targetPackage="com.android.car.updatable"
+             android:targetName="CarServiceCustomization"
+             android:resourcesMap="@xml/overlays"
+             android:isStatic="true" />
+</manifest>
diff --git a/common/rro_overlays/CarServiceOverlay/res/values/config.xml b/common/rro_overlays/CarServiceOverlay/res/values/config.xml
new file mode 100644
index 0000000..85c1c1a
--- /dev/null
+++ b/common/rro_overlays/CarServiceOverlay/res/values/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+*/
+-->
+
+<!-- Resources to configure car service based on each OEM's preference. -->
+<resources>
+    <!-- The Model ID to advertise Bluetooth Fast Pair connections with.  Must be overlaid with
+         device specific model id. A model id of 0 will disable Fast Pair-->
+    <integer name="fastPairModelId">0x5CC69B</integer>
+
+    <!-- The Anti Spoofing Public key associated with the advertised Fast Pair Model ID, base64
+         encoded. -->
+    <string name="fastPairAntiSpoofKey"
+        translatable="false">w8WfTvivRPc5kvoysLooga9rrlxQ7zlj1X+THUTSg/8=</string>
+</resources>
diff --git a/common/rro_overlays/CarServiceOverlay/res/xml/overlays.xml b/common/rro_overlays/CarServiceOverlay/res/xml/overlays.xml
new file mode 100644
index 0000000..daf4c7e
--- /dev/null
+++ b/common/rro_overlays/CarServiceOverlay/res/xml/overlays.xml
@@ -0,0 +1,20 @@
+<?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.
+  -->
+<overlay>
+    <item target="integer/fastPairModelId" value="@integer/fastPairModelId" />
+    <item target="string/fastPairAntiSpoofKey" value="@string/fastPairAntiSpoofKey" />
+</overlay>
diff --git a/oriole_car/device-oriole-car.mk b/oriole_car/device-oriole-car.mk
index 0922e3f..ec20ba0 100644
--- a/oriole_car/device-oriole-car.mk
+++ b/oriole_car/device-oriole-car.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-PHONE_CAR_BOARD_PRODUCT := oriole_car
+AUTOMOTIVE_PRODUCT_PATH := google_car/oriole_car
 
 $(call inherit-product, packages/services/Car/car_product/build/car.mk)
 
diff --git a/coral_car/BoardConfig.mk b/panther_car/BoardConfig.mk
index 5978b7d..6dd51ec 100644
--- a/coral_car/BoardConfig.mk
+++ b/panther_car/BoardConfig.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 The Android Open-Source Project
+# 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.
@@ -14,13 +14,9 @@
 # limitations under the License.
 #
 
-# Contents of this file were copied from device/google/coral/coral/BoardConfig.mk,
+# Contents of this file were copied from device/google/pantah/panther/BoardConfig.mk,
 # except for:
 #
 # * TARGET_SCREEN_DENSITY is scaled down by 1.75x
 
-TARGET_BOOTLOADER_BOARD_NAME := coral
-TARGET_SCREEN_DENSITY := 320
-TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165
-
-include device/google/coral/BoardConfig-common.mk
+TARGET_SCREEN_DENSITY := 240
diff --git a/coral_car/aosp_coral_car.mk b/panther_car/aosp_panther_car.mk
index 130bff2..cb121cb 100644
--- a/coral_car/aosp_coral_car.mk
+++ b/panther_car/aosp_panther_car.mk
@@ -1,5 +1,5 @@
 #
-# Copyright 2019 The Android Open Source Project
+# Copyright 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.
@@ -14,14 +14,17 @@
 # limitations under the License.
 #
 
+DEVICE_IS_64BIT_ONLY := true
+
+PRODUCT_PACKAGE_OVERLAYS += device/google_car/panther_car/overlay
+
 $(call inherit-product, device/google_car/common/pre_google_car.mk)
-$(call inherit-product, device/google_car/coral_car/device-coral-car.mk)
-$(call inherit-product-if-exists, vendor/google_devices/coral/proprietary/device-vendor.mk)
-$(call inherit-product-if-exists, vendor/google_devices/coral/prebuilts/device-vendor-coral.mk)
+$(call inherit-product, device/google_car/panther_car/device-panther-car.mk)
+$(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/panther/device-vendor-panther.mk)
 $(call inherit-product, device/google_car/common/post_google_car.mk)
 
-PRODUCT_MANUFACTURER := Google
+PRODUCT_NAME := aosp_panther_car
+PRODUCT_DEVICE := panther
+PRODUCT_MODEL := AOSP on panther
 PRODUCT_BRAND := Android
-PRODUCT_NAME := aosp_coral_car
-PRODUCT_DEVICE := coral
-PRODUCT_MODEL := AOSP on coral
+PRODUCT_MANUFACTURER := Google
diff --git a/flame_car/BoardConfig.mk b/panther_car/device-panther-car.mk
index 22e8ca4..740d7ac 100644
--- a/flame_car/BoardConfig.mk
+++ b/panther_car/device-panther-car.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 The Android Open-Source Project
+# Copyright 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.
@@ -14,14 +14,16 @@
 # limitations under the License.
 #
 
-# Contents of this file were copied from device/google/coral/flame/BoardConfig.mk,
-# except for:
-#
-# * TARGET_SCREEN_DENSITY is scaled down by 1.75x
+PHONE_CAR_BOARD_PRODUCT := panther_car
+
+$(call inherit-product, packages/services/Car/car_product/build/car.mk)
+
+$(call inherit-product, device/google/pantah/device-panther.mk)
 
+include device/google/gs101/uwb/uwb.mk
 
-TARGET_BOOTLOADER_BOARD_NAME := flame
-TARGET_SCREEN_DENSITY := 250
-TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165
+PRODUCT_PRODUCT_PROPERTIES+= \
+    ro.adb.secure=0
 
-include device/google/coral/BoardConfig-common.mk
+PRODUCT_PACKAGES += \
+    librs_jni
diff --git a/panther_car/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/panther_car/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
new file mode 100644
index 0000000..971d192
--- /dev/null
+++ b/panther_car/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -0,0 +1,21 @@
+<?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.
+ */
+-->
+<resources>
+    <integer name="def_user_rotation">1</integer>
+</resources>
diff --git a/raven_car/aosp_raven_car.mk b/raven_car/aosp_raven_car.mk
index cebd123..3aa87fe 100644
--- a/raven_car/aosp_raven_car.mk
+++ b/raven_car/aosp_raven_car.mk
@@ -14,6 +14,9 @@
 # limitations under the License.
 #
 
+PRODUCT_COPY_FILES += \
+    device/google_car/raven_car/displayconfig/display_id_4619827677550801152.xml:$(TARGET_COPY_OUT_VENDOR)/etc/displayconfig/display_id_4619827677550801152.xml
+
 $(call inherit-product, device/google_car/common/pre_google_car.mk)
 $(call inherit-product, device/google_car/raven_car/device-raven-car.mk)
 $(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/raven/device-vendor-raven.mk)
diff --git a/raven_car/device-raven-car.mk b/raven_car/device-raven-car.mk
index 7ca5caf..08fd96f 100644
--- a/raven_car/device-raven-car.mk
+++ b/raven_car/device-raven-car.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-PHONE_CAR_BOARD_PRODUCT := raven_car
+AUTOMOTIVE_PRODUCT_PATH := google_car/raven_car
 
 $(call inherit-product, packages/services/Car/car_product/build/car.mk)
 
diff --git a/raven_car/displayconfig/display_id_4619827677550801152.xml b/raven_car/displayconfig/display_id_4619827677550801152.xml
new file mode 100644
index 0000000..91841c5
--- /dev/null
+++ b/raven_car/displayconfig/display_id_4619827677550801152.xml
@@ -0,0 +1,103 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+
+<!-- Copyright (C) 2022 Google Inc.
+
+    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.
+-->
+
+<!-- This overrides <density> to 320 for Phone_car configuration.  The original file is located at
+    vendor/google_devices/raviole/proprietary/raven/vendor/etc/displayconfig/display_id_4619827677550801152.xml -->
+
+<displayConfiguration>
+    <densityMapping>
+        <density>
+            <height>1440</height>
+            <width>3120</width>
+            <density>320</density>
+        </density>
+    </densityMapping>
+    <screenBrightnessMap>
+        <point>
+            <value>0.0</value>
+            <nits>2.0</nits>
+        </point>
+        <point>
+            <value>0.62</value>
+            <nits>500.0</nits>
+        </point>
+        <point>
+            <value>1.0</value>
+            <nits>800.0</nits>
+        </point>
+    </screenBrightnessMap>
+    <highBrightnessMode enabled="true">
+        <transitionPoint>0.62</transitionPoint>
+        <minimumLux>10000</minimumLux>
+        <timing>
+            <!-- allow for 5 minutes out of every 30 minutes -->
+            <timeWindowSecs>1800</timeWindowSecs>
+            <timeMaxSecs>300</timeMaxSecs>
+            <timeMinSecs>60</timeMinSecs>
+        </timing>
+        <refreshRate>
+            <minimum>120</minimum>
+            <maximum>120</maximum>
+        </refreshRate>
+        <thermalStatusLimit>light</thermalStatusLimit>
+        <allowInLowPowerMode>false</allowInLowPowerMode>
+    </highBrightnessMode>
+    <ambientBrightnessChangeThresholds>
+        <brighteningThresholds>
+            <minimum>10</minimum>
+        </brighteningThresholds>
+        <darkeningThresholds>
+            <minimum>2</minimum>
+        </darkeningThresholds>
+    </ambientBrightnessChangeThresholds>
+
+    <ambientLightHorizonLong>5000</ambientLightHorizonLong>
+    <ambientLightHorizonShort>50</ambientLightHorizonShort>
+
+    <screenBrightnessRampIncreaseMaxMillis>2000</screenBrightnessRampIncreaseMaxMillis>
+
+    <thermalThrottling>
+        <brightnessThrottlingMap>
+            <brightnessThrottlingPoint>
+                <thermalStatus>light</thermalStatus>
+                <!-- Throttling to 465 nits: (465-2.0)/(500-2.0)*(0.62-0.0)+0.0 = 0.576425703 -->
+                <brightness>0.576425703</brightness>
+            </brightnessThrottlingPoint>
+            <brightnessThrottlingPoint>
+                <thermalStatus>moderate</thermalStatus>
+                <!-- Throttling to 297 nits: (297-2.0)/(500-2.0)*(0.62-0.0)+0.0 = 0.367269076 -->
+                <brightness>0.367269076</brightness>
+            </brightnessThrottlingPoint>
+            <brightnessThrottlingPoint>
+                <thermalStatus>severe</thermalStatus>
+                <!-- Throttling to 213 nits: (213-2.0)/(500-2.0)*(0.62-0.0)+0.0 = 0.262690763 -->
+                <brightness>0.262690763</brightness>
+            </brightnessThrottlingPoint>
+            <brightnessThrottlingPoint>
+                <thermalStatus>critical</thermalStatus>
+                <!-- Throttling to 150 nits: (150-2.0)/(500-2.0)*(0.62-0.0)+0.0 = 0.184257028 -->
+                <brightness>0.184257028</brightness>
+            </brightnessThrottlingPoint>
+        </brightnessThrottlingMap>
+    </thermalThrottling>
+
+    <screenBrightnessRampFastDecrease>0.7047244</screenBrightnessRampFastDecrease>
+    <screenBrightnessRampFastIncrease>0.7047244</screenBrightnessRampFastIncrease>
+    <screenBrightnessRampSlowDecrease>0.05</screenBrightnessRampSlowDecrease>
+    <screenBrightnessRampSlowIncrease>0.05</screenBrightnessRampSlowIncrease>
+</displayConfiguration>
+
diff --git a/redfin_car/device-redfin-car.mk b/redfin_car/device-redfin-car.mk
index 41c2740..cbd14ed 100644
--- a/redfin_car/device-redfin-car.mk
+++ b/redfin_car/device-redfin-car.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-PHONE_CAR_BOARD_PRODUCT := redfin_car
+AUTOMOTIVE_PRODUCT_PATH := google_car/redfin_car
 
 $(call inherit-product, packages/services/Car/car_product/build/car.mk)
 
diff --git a/sunfish_car/device-sunfish-car.mk b/sunfish_car/device-sunfish-car.mk
index 8955fe6..2674e34 100644
--- a/sunfish_car/device-sunfish-car.mk
+++ b/sunfish_car/device-sunfish-car.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-PHONE_CAR_BOARD_PRODUCT := sunfish_car
+AUTOMOTIVE_PRODUCT_PATH := google_car/sunfish_car
 
 $(call inherit-product, packages/services/Car/car_product/build/car.mk)
 
diff --git a/coral_car/device-coral-car.mk b/tangorpro_car/BoardConfig.mk
index 88c7ff8..691fdc4 100644
--- a/coral_car/device-coral-car.mk
+++ b/tangorpro_car/BoardConfig.mk
@@ -1,5 +1,5 @@
 #
-# Copyright 2019 The Android Open Source Project
+# 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.
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-PHONE_CAR_BOARD_PRODUCT := coral_car
+# * TARGET_SCREEN_DENSITY is scaled down by 1.6x
 
-$(call inherit-product, packages/services/Car/car_product/build/car.mk)
-
-$(call inherit-product, device/google/coral/device-coral.mk)
+TARGET_SCREEN_DENSITY := 200
diff --git a/flame_car/aosp_flame_car.mk b/tangorpro_car/aosp_tangorpro_car.mk
index 6c2cd0f..96b000c 100644
--- a/flame_car/aosp_flame_car.mk
+++ b/tangorpro_car/aosp_tangorpro_car.mk
@@ -1,5 +1,5 @@
 #
-# Copyright 2020 The Android Open Source Project
+# Copyright 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.
@@ -14,15 +14,17 @@
 # limitations under the License.
 #
 
+DEVICE_IS_64BIT_ONLY := true
+
+
+PRODUCT_PACKAGE_OVERLAYS += device/google_car/tangorpro_car/overlay
+
 $(call inherit-product, device/google_car/common/pre_google_car.mk)
-$(call inherit-product, device/google_car/flame_car/device-flame-car.mk)
+$(call inherit-product, device/google_car/tangorpro_car/device-tangorpro-car.mk)
 $(call inherit-product, device/google_car/common/post_google_car.mk)
 
-$(call inherit-product-if-exists, vendor/google_devices/coral/proprietary/device-vendor.mk)
-$(call inherit-product-if-exists, vendor/google_devices/coral/prebuilts/device-vendor-flame.mk)
-
-PRODUCT_MANUFACTURER := Google
+PRODUCT_NAME := aosp_tangorpro_car
+PRODUCT_DEVICE := tangorpro
+PRODUCT_MODEL := AOSP on Tangorpro
 PRODUCT_BRAND := Android
-PRODUCT_NAME := aosp_flame_car
-PRODUCT_DEVICE := flame
-PRODUCT_MODEL := AOSP on flame
+PRODUCT_MANUFACTURER := Google
diff --git a/tangorpro_car/device-tangorpro-car.mk b/tangorpro_car/device-tangorpro-car.mk
new file mode 100644
index 0000000..b425e88
--- /dev/null
+++ b/tangorpro_car/device-tangorpro-car.mk
@@ -0,0 +1,29 @@
+#
+# Copyright 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.
+#
+
+PHONE_CAR_BOARD_PRODUCT := tangorpro_car
+
+$(call inherit-product, packages/services/Car/car_product/build/car.mk)
+
+$(call inherit-product, device/google/tangorpro/device-tangorpro.mk)
+
+#include device/google/gs101/uwb/uwb.mk
+
+PRODUCT_PRODUCT_PROPERTIES+= \
+    ro.adb.secure=0
+
+PRODUCT_PACKAGES += \
+    librs_jni
diff --git a/tangorpro_car/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/tangorpro_car/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
new file mode 100644
index 0000000..b3ea71a
--- /dev/null
+++ b/tangorpro_car/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -0,0 +1,21 @@
+<?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.
+ */
+-->
+<resources>
+    <integer name="def_user_rotation">3</integer>
+</resources>