Merge Android 24Q1 Release (ab/11220357)temp_319669529

Bug: 319669529
Merged-In: I96bb0be5a0a7c9d8b5cf49d54e0475ad8826b10e
Change-Id: I7c432778389d3337ee647a057436bc957ab538fc

8 files changed, 49 insertions, 27 deletions

diff --git a/products/aosp_tv_arm64.mk b/products/aosp_tv_arm64.mk
index bb97c2d..f6244b5 100644
--- a/products/aosp_tv_arm64.mk
+++ b/products/aosp_tv_arm64.mk
@@ -49,6 +49,8 @@ PRODUCT_PACKAGES += \
 # All components inherited here go to product image
 #
 $(call inherit-product, device/google/atv/products/atv_product.mk)
+# Default sound experience
+$(call inherit-product-if-exists, frameworks/base/data/sounds/AudioTv.mk)
 # Packages required for ATV GSI
 PRODUCT_PACKAGES += \
     LeanbackIME \
@@ -58,7 +60,7 @@ PRODUCT_PACKAGES += \
 # All components inherited here go to vendor image
 #
 $(call inherit-product, device/google/atv/products/atv_emulator_vendor.mk)
-$(call inherit-product-if-exists, device/generic/goldfish/arm64-vendor.mk)
+$(call inherit-product, device/generic/goldfish/board/emu64a/details.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)
 
 #
diff --git a/products/aosp_tv_x86.mk b/products/aosp_tv_x86.mk
index 4c5fa9f..f7cad49 100644
--- a/products/aosp_tv_x86.mk
+++ b/products/aosp_tv_x86.mk
@@ -48,10 +48,14 @@ PRODUCT_PACKAGES += \
 # All components inherited here go to product image
 #
 $(call inherit-product, device/google/atv/products/atv_product.mk)
+# Default sound experience
+$(call inherit-product-if-exists, frameworks/base/data/sounds/AudioTv.mk)
 # Packages required for ATV GSI
+ifeq (aosp_tv_x86,$(TARGET_PRODUCT))
 PRODUCT_PACKAGES += \
     LeanbackIME \
     TvSampleLeanbackLauncher
+endif
 
 #
 # All components inherited here go to vendor image
diff --git a/products/atv_emulator_vendor.mk b/products/atv_emulator_vendor.mk
index 4659e0b..32d5e2b 100644
--- a/products/atv_emulator_vendor.mk
+++ b/products/atv_emulator_vendor.mk
@@ -22,10 +22,14 @@ EMULATOR_VENDOR_NO_GNSS := true
 EMULATOR_VENDOR_NO_BIOMETRICS := true
 EMULATOR_VENDOR_NO_SENSORS := true
 
-$(call inherit-product, device/google/atv/products/atv_vendor.mk)
+ifneq ($(PRODUCT_IS_ATV_ARM64_SDK),true)
+    $(call inherit-product, device/google/atv/products/atv_vendor.mk)
+endif
 
 # Sets HDMI CEC as Playback Device.
-PRODUCT_PROPERTY_OVERRIDES += ro.hdmi.device_type=4
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.hdmi.device_type=4 \
+    ro.hdmi.cec_device_types=playback_device
 
 # need this for gles libraries to load properly
 # after moving to /vendor/lib/
@@ -33,10 +37,15 @@ PRODUCT_PACKAGES += \
     vndk-sp
 
 DEVICE_PACKAGE_OVERLAYS += \
-    device/generic/goldfish/overlay \
     device/google/atv/sdk_overlay \
     development/sdk_overlay
 
+# Declared in emulator64_vendor.mk for 64-bit targets.
+ifneq ($(PRODUCT_IS_ATV_ARM64_SDK),true)
+    DEVICE_PACKAGE_OVERLAYS += \
+        device/generic/goldfish/overlay
+endif
+
 PRODUCT_CHARACTERISTICS := emulator
 
 PRODUCT_FULL_TREBLE_OVERRIDE := true
@@ -45,8 +54,8 @@ PRODUCT_COPY_FILES += \
     device/generic/goldfish/data/etc/config.ini.tv:config.ini
 
 PRODUCT_COPY_FILES += \
-    device/generic/goldfish/data/etc/apns-conf.xml:$(TARGET_COPY_OUT_VENDOR)/etc/apns-conf.xml \
     device/generic/goldfish/camera/media/media_codecs_google_tv.xml:${TARGET_COPY_OUT_VENDOR}/etc/media_codecs_google_tv.xml \
+    device/generic/goldfish/data/etc/apns-conf.xml:$(TARGET_COPY_OUT_VENDOR)/etc/apns-conf.xml \
     frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml \
     hardware/libhardware_legacy/audio/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf
 
@@ -56,7 +65,11 @@ PRODUCT_COPY_FILES += \
     device/google/atv/permissions/tv_sdk_excluded_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tv_sdk_excluded_core_hardware.xml
 
 # goldfish vendor partition configurations
-$(call inherit-product-if-exists, device/generic/goldfish/64bitonly/product/vendor.mk)
+ifeq ($(PRODUCT_IS_ATV_ARM64_SDK),true)
+    $(call inherit-product-if-exists, device/generic/goldfish/64bitonly/product/emulator64_vendor.mk)
+else
+    $(call inherit-product-if-exists, device/generic/goldfish/64bitonly/product/vendor.mk)
+endif
 
 #watchdog tiggers reboot because location service is not
 #responding, disble it for now.
diff --git a/products/atv_generic_system.mk b/products/atv_generic_system.mk
index d14f2a1..577ee3b 100644
--- a/products/atv_generic_system.mk
+++ b/products/atv_generic_system.mk
@@ -29,6 +29,11 @@ PRODUCT_PACKAGES += \
     update_engine \
     update_verifier \
 
+ifeq ($(PRODUCT_REQUIRES_PAI_STUB),true)
+PRODUCT_PACKAGES += \
+	AtomPlayAutoInstallStub
+endif
+
 # Wrapped net utils for /vendor access.
 PRODUCT_PACKAGES += netutils-wrapper-1.0
 
diff --git a/products/atv_logpersist.mk b/products/atv_logpersist.mk
new file mode 100644
index 0000000..7c0f814
--- /dev/null
+++ b/products/atv_logpersist.mk
@@ -0,0 +1,9 @@
+# Optional configuration that can be used to enable persistent logcat on -eng and -userdebug builds
+# See go/agw/platform/system/logging/+/refs/heads/master/logd/README.property for available options
+
+ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
+PRODUCT_PRODUCT_PROPERTIES +=
+    logd.logpersistd=logcatd \
+    logd.logpersistd.size=30 \
+    logd.logpersistd.rotate_kbytes=2048
+endif
diff --git a/products/atv_system_ext.mk b/products/atv_system_ext.mk
index 68f7755..e57f8a6 100644
--- a/products/atv_system_ext.mk
+++ b/products/atv_system_ext.mk
@@ -20,8 +20,16 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/media_system_ext.mk)
 PRODUCT_PACKAGES += \
     blur_sysprop_notifier \
     TvSystemUI \
+    TvFeedbackConsent \
     TvFrameworkPackageStubs \
     TvSettings
 
+ifeq ($(MDNS_OFFLOAD_SUPPORT),true)
+    PRODUCT_PACKAGES += MdnsOffloadManagerService
+endif
+
 SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += device/google/atv/sepolicy/system_ext/public
 SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/atv/sepolicy/system_ext/private
+
+# Always disable Compose features in SystemUI to avoid APK size increase.
+SYSTEMUI_USE_COMPOSE := false
diff --git a/products/gsi_tv_base.mk b/products/gsi_tv_base.mk
index d9576ab..86abe4a 100644
--- a/products/gsi_tv_base.mk
+++ b/products/gsi_tv_base.mk
@@ -41,6 +41,8 @@ PRODUCT_PACKAGES += system_ext_userdebug_plat_sepolicy.cil
 # All components inherited here go to product image
 #
 $(call inherit-product, device/google/atv/products/atv_product.mk)
+# Default sound experience
+$(call inherit-product-if-exists, frameworks/base/data/sounds/AudioTv.mk)
 # Packages required for ATV GSI
 PRODUCT_PACKAGES += \
     LeanbackIME \
diff --git a/products/sdk_atv_arm64.mk b/products/sdk_atv_arm64.mk
deleted file mode 100644
index f887f8b..0000000
--- a/products/sdk_atv_arm64.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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.
-#
-PRODUCT_IS_ATV_SDK := true
-
-# Overrides
-PRODUCT_BRAND := Android
-PRODUCT_NAME := sdk_atv_arm64
-PRODUCT_DEVICE := generic_arm64