Snap for 7439290 from d1ca7a9cbd0628ef2ac2780f675867d057d1eb60 to tm-release

Change-Id: I2059974c7bb821c4739dd16a092656916c876a16
This commit is contained in:
android-build-team Robot 2021-06-09 03:01:24 +00:00
commit 63419da6bc
16 changed files with 25 additions and 12 deletions

View file

@ -216,7 +216,7 @@
<!-- Bluetooth Audio HAL --> <!-- Bluetooth Audio HAL -->
<xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/> <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -195,7 +195,7 @@
<!-- Bluetooth Audio HAL --> <!-- Bluetooth Audio HAL -->
<xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/> <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -195,7 +195,7 @@
<!-- A2dp Audio HAL --> <!-- A2dp Audio HAL -->
<xi:include href="a2dp_audio_policy_configuration_7_0.xml"/> <xi:include href="a2dp_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -216,7 +216,7 @@
<!-- Bluetooth Audio HAL --> <!-- Bluetooth Audio HAL -->
<xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/> <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -195,7 +195,7 @@
<!-- Bluetooth Audio HAL --> <!-- Bluetooth Audio HAL -->
<xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/> <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -195,7 +195,7 @@
<!-- A2dp Audio HAL --> <!-- A2dp Audio HAL -->
<xi:include href="a2dp_audio_policy_configuration_7_0.xml"/> <xi:include href="a2dp_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -216,7 +216,7 @@
<!-- Bluetooth Audio HAL --> <!-- Bluetooth Audio HAL -->
<xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/> <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -195,7 +195,7 @@
<!-- Bluetooth Audio HAL --> <!-- Bluetooth Audio HAL -->
<xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/> <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -195,7 +195,7 @@
<!-- A2dp Audio HAL --> <!-- A2dp Audio HAL -->
<xi:include href="a2dp_audio_policy_configuration_7_0.xml"/> <xi:include href="a2dp_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -190,7 +190,7 @@
<!-- Bluetooth Audio HAL --> <!-- Bluetooth Audio HAL -->
<xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/> <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -190,7 +190,7 @@
<!-- Bluetooth Audio HAL --> <!-- Bluetooth Audio HAL -->
<xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/> <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -190,7 +190,7 @@
<!-- A2dp Audio HAL --> <!-- A2dp Audio HAL -->
<xi:include href="a2dp_audio_policy_configuration_7_0.xml"/> <xi:include href="a2dp_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -18,3 +18,9 @@ on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_complet
on late-init && property:ro.boot.hardware.revision=PROTO1.0 on late-init && property:ro.boot.hardware.revision=PROTO1.0
setprop vendor.thermal.config "thermal_info_config_WHI_A.json" setprop vendor.thermal.config "thermal_info_config_WHI_A.json"
# For Japan sku, always enforce camera shutter sound
# Since this property is read by the audio server in system service,
# it should be written by the system init.
on property:ro.boot.hardware.sku=GR1YH
setprop audio.camerasound.force true

View file

@ -30,3 +30,9 @@ on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_complet
# Bluetooth # Bluetooth
on post-fs-data on post-fs-data
chown bluetooth system /proc/bluetooth/timesync chown bluetooth system /proc/bluetooth/timesync
# For Japan sku, always enforce camera shutter sound
# Since this property is read by the audio server in system service,
# it should be written by the system init.
on property:ro.boot.hardware.sku=GF5KQ
setprop audio.camerasound.force true

View file

@ -22,6 +22,7 @@ $(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device
$(call inherit-product-if-exists, vendor/google_devices/oriole/proprietary/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/oriole/proprietary/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/oriole/device-vendor-oriole.mk) $(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/oriole/device-vendor-oriole.mk)
$(call inherit-product-if-exists, vendor/google/camera/devices/raviole/oriole/device-vendor.mk) $(call inherit-product-if-exists, vendor/google/camera/devices/raviole/oriole/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/WallpapersOriole.mk)
DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay