Merge Android 14 QPR2 to AOSP main

Bug: 319669529
Merged-In: Ic7ec0de5c4a3a4fd2f99529dfe6cc7bc83c892cd
Change-Id: I40b75b34a5569987b7fa76a7bcb6dff7bd50b58b

10 files changed, 19 insertions, 160 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index dbc6c65..c37ea7a 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -18,8 +18,6 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/bluejay_car/aosp_bluejay_car.mk \
     $(LOCAL_DIR)/bramble_car/aosp_bramble_car.mk \
     $(LOCAL_DIR)/cheetah_car/aosp_cheetah_car.mk \
-    $(LOCAL_DIR)/coral_car/aosp_coral_car.mk \
-    $(LOCAL_DIR)/flame_car/aosp_flame_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 \
@@ -32,8 +30,6 @@ COMMON_LUNCH_CHOICES := \
     aosp_bluejay_car-trunk_staging-userdebug \
     aosp_bramble_car-trunk_staging-userdebug \
     aosp_cheetah_car-trunk_staging-userdebug \
-    aosp_coral_car-trunk_staging-userdebug \
-    aosp_flame_car-trunk_staging-userdebug \
     aosp_oriole_car-trunk_staging-userdebug \
     aosp_panther_car-trunk_staging-userdebug \
     aosp_raven_car-trunk_staging-userdebug \
diff --git a/OWNERS b/OWNERS
index bc14dd7..3d821f6 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,4 @@
 sgaurav@google.com
 nirajdesai@google.com
 chengandrew@google.com
+calhuang@google.com
diff --git a/common/post_google_car.mk b/common/post_google_car.mk
index ee1b2e4..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 \
@@ -56,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 deb94d3..5c5972f 100644
--- a/common/pre_google_car.mk
+++ b/common/pre_google_car.mk
@@ -53,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
diff --git a/coral_car/BoardConfig.mk b/coral_car/BoardConfig.mk
deleted file mode 100644
index 5978b7d..0000000
--- a/coral_car/BoardConfig.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# 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.
-#
-
-# Contents of this file were copied from device/google/coral/coral/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
diff --git a/coral_car/aosp_coral_car.mk b/coral_car/aosp_coral_car.mk
deleted file mode 100644
index 130bff2..0000000
--- a/coral_car/aosp_coral_car.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright 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.
-#
-
-$(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/common/post_google_car.mk)
-
-PRODUCT_MANUFACTURER := Google
-PRODUCT_BRAND := Android
-PRODUCT_NAME := aosp_coral_car
-PRODUCT_DEVICE := coral
-PRODUCT_MODEL := AOSP on coral
diff --git a/coral_car/device-coral-car.mk b/coral_car/device-coral-car.mk
deleted file mode 100644
index e43eb0a..0000000
--- a/coral_car/device-coral-car.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright 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.
-#
-
-AUTOMOTIVE_PRODUCT_PATH := google_car/coral_car
-
-$(call inherit-product, packages/services/Car/car_product/build/car.mk)
-
-$(call inherit-product, device/google/coral/device-coral.mk)
diff --git a/flame_car/BoardConfig.mk b/flame_car/BoardConfig.mk
deleted file mode 100644
index 22e8ca4..0000000
--- a/flame_car/BoardConfig.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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.
-#
-
-# Contents of this file were copied from device/google/coral/flame/BoardConfig.mk,
-# except for:
-#
-# * TARGET_SCREEN_DENSITY is scaled down by 1.75x
-
-
-TARGET_BOOTLOADER_BOARD_NAME := flame
-TARGET_SCREEN_DENSITY := 250
-TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165
-
-include device/google/coral/BoardConfig-common.mk
diff --git a/flame_car/aosp_flame_car.mk b/flame_car/aosp_flame_car.mk
deleted file mode 100644
index 6c2cd0f..0000000
--- a/flame_car/aosp_flame_car.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright 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.
-#
-
-$(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/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_BRAND := Android
-PRODUCT_NAME := aosp_flame_car
-PRODUCT_DEVICE := flame
-PRODUCT_MODEL := AOSP on flame
diff --git a/flame_car/device-flame-car.mk b/flame_car/device-flame-car.mk
deleted file mode 100644
index 29967d2..0000000
--- a/flame_car/device-flame-car.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright 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.
-#
-
-AUTOMOTIVE_PRODUCT_PATH := google_car/flame_car
-
-$(call inherit-product, packages/services/Car/car_product/build/car.mk)
-
-$(call inherit-product, device/google/coral/device-flame.mk)