[automerger skipped] Merge Android 13 QPR1 am: 3b32735134 -s ours am: da585bc6c7 -s ours am: f2f7cbdeab -s ours
am skip reason: Merged-In I0c5d48ef9a04ad7bbbb8960cb33da4b2112c3e5f with SHA-1 de1dda9735 is already in history
Original change: https://android-review.googlesource.com/c/device/google_car/+/2338243
Change-Id: I0c70e12783feaf81b8d27c74a840e4be4ef4fe72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.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/common/pre_google_car.mk b/common/pre_google_car.mk
index 7cb6379..6012c95 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 := *'
@@ -64,9 +67,11 @@
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/coral_car/device-coral-car.mk b/coral_car/device-coral-car.mk
index 88c7ff8..e43eb0a 100644
--- a/coral_car/device-coral-car.mk
+++ b/coral_car/device-coral-car.mk
@@ -14,7 +14,7 @@
# limitations under the License.
#
-PHONE_CAR_BOARD_PRODUCT := coral_car
+AUTOMOTIVE_PRODUCT_PATH := google_car/coral_car
$(call inherit-product, packages/services/Car/car_product/build/car.mk)
diff --git a/flame_car/device-flame-car.mk b/flame_car/device-flame-car.mk
index 28d0314..29967d2 100644
--- a/flame_car/device-flame-car.mk
+++ b/flame_car/device-flame-car.mk
@@ -14,7 +14,7 @@
# limitations under the License.
#
-PHONE_CAR_BOARD_PRODUCT := flame_car
+AUTOMOTIVE_PRODUCT_PATH := google_car/flame_car
$(call inherit-product, packages/services/Car/car_product/build/car.mk)
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/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)
