Snap for 11533280 from a43fedce4e to 24Q3-release

Change-Id: I1d978c0244655952db4445e76506b5caa43a6fe6
This commit is contained in:
Android Build Coastguard Worker 2024-03-06 00:02:03 +00:00
commit add8366336
3 changed files with 20 additions and 5 deletions

View file

@ -36,7 +36,6 @@ include device/google/gs-common/sota_app/factoryota.mk
include device/google/gs-common/misc_writer/misc_writer.mk include device/google/gs-common/misc_writer/misc_writer.mk
include device/google/gs-common/gyotaku_app/gyotaku.mk include device/google/gs-common/gyotaku_app/gyotaku.mk
include device/google/gs-common/bootctrl/bootctrl_aidl.mk include device/google/gs-common/bootctrl/bootctrl_aidl.mk
include device/google/gs-common/betterbug/betterbug.mk
ifneq ($(filter oriole raven bluejay, $(TARGET_PRODUCT)),) ifneq ($(filter oriole raven bluejay, $(TARGET_PRODUCT)),)
include device/google/gs-common/bcmbt/dump/dumplog.mk include device/google/gs-common/bcmbt/dump/dumplog.mk
endif endif
@ -508,10 +507,6 @@ PRODUCT_PACKAGES += \
com.android.future.usb.accessory com.android.future.usb.accessory
# for now include gralloc here. should come from hardware/google_devices/exynos5 # for now include gralloc here. should come from hardware/google_devices/exynos5
PRODUCT_PACKAGES += \
android.hardware.graphics.mapper@4.0-impl \
android.hardware.graphics.allocator-V1-service
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.memtrack-service.pixel \ android.hardware.memtrack-service.pixel \
libion_exynos \ libion_exynos \
@ -819,6 +814,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.bqr.min_interval_ms=500 persist.bluetooth.bqr.min_interval_ms=500
endif endif
# Enable Bluetooth AutoOn feature
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.server.automatic_turn_on=true
#VNDK #VNDK
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
vndk-libs vndk-libs
@ -1117,3 +1116,4 @@ include hardware/google/pixel/HardwareInfo/HardwareInfo.mk
# Touch service # Touch service
include device/google/gs-common/touch/twoshay/aidl_gs101.mk include device/google/gs-common/touch/twoshay/aidl_gs101.mk
include device/google/gs-common/touch/twoshay/twoshay.mk

View file

@ -17,4 +17,14 @@
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal> </hal>
<hal format="aidl">
<name>android.hardware.media.c2</name>
<version>1</version>
<fqname>IComponentStore/default1</fqname>
</hal>
<hal format="aidl">
<name>android.hardware.media.c2</name>
<version>1</version>
<fqname>IComponentStore/default</fqname>
</hal>
</manifest> </manifest>

View file

@ -8,4 +8,9 @@
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal> </hal>
<hal format="aidl">
<name>android.hardware.media.c2</name>
<version>1</version>
<fqname>IComponentStore/default</fqname>
</hal>
</manifest> </manifest>