author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-11-11 10:49:37 (GMT) |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-11 10:49:37 (GMT) |
commit | e30faa0f56848e2ec38e96482d3df933124ddbdf (patch) | |
tree | 0281f79db5b5e18428701350d614747240737164 | |
parent | 6231afdeeb081071d8ca85412535a1852848f7f8 (diff) | |
parent | 85db89fb6f3a8f59f3e342952568e32b13ea7108 (diff) | |
download | common-e30faa0f56848e2ec38e96482d3df933124ddbdf.zip common-e30faa0f56848e2ec38e96482d3df933124ddbdf.tar.gz common-e30faa0f56848e2ec38e96482d3df933124ddbdf.tar.bz2 |
Merge "common: SHIPPING_API_LEVEL upgrade to 30 [3/3]" into r-tv-dev am: 85db89fb6f
Original change: undetermined
Change-Id: Ib2abf8b8486dae91e78d08ada07276a378fa5265
-rw-r--r-- | hidl_manifests/manifest_kernel5.xml | 3 | ||||
-rw-r--r-- | hidl_manifests/newdevices/device_matrix_product_amlogic.xml | 39 | ||||
-rw-r--r-- | hidl_manifests/newdevices/manifest_boot.xml | 11 | ||||
-rw-r--r-- | hidl_manifests/newdevices/manifest_cas.xml | 11 | ||||
-rw-r--r-- | hidl_manifests/newdevices/manifest_common.xml | 169 | ||||
-rw-r--r-- | hidl_manifests/newdevices/manifest_ir.xml | 11 |
6 files changed, 241 insertions, 3 deletions
diff --git a/hidl_manifests/manifest_kernel5.xml b/hidl_manifests/manifest_kernel5.xml deleted file mode 100644 index 804f41e..0000000 --- a/hidl_manifests/manifest_kernel5.xml +++ b/dev/null @@ -1,3 +0,0 @@ -<manifest version="1.0" type="device" target-level="4"> - <kernel target-level="5"/> -</manifest> diff --git a/hidl_manifests/newdevices/device_matrix_product_amlogic.xml b/hidl_manifests/newdevices/device_matrix_product_amlogic.xml new file mode 100644 index 0000000..ac01f12 --- a/dev/null +++ b/hidl_manifests/newdevices/device_matrix_product_amlogic.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<compatibility-matrix version="1.0" type="framework"> + <hal> + <name>vendor.amlogic.hardware.systemcontrol</name> + <transport>hwbinder</transport> + <version>1.1</version> + <interface> + <name>ISystemControl</name> + <instance>default</instance> + </interface> + </hal> + <hal> + <name>vendor.amlogic.hardware.hdmicec</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>IDroidHdmiCEC</name> + <instance>default</instance> + </interface> + </hal> + <hal> + <name>vendor.amlogic.hardware.subtitleserver</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>ISubtitleServer</name> + <instance>default</instance> + </interface> + </hal> + <hal> + <name>vendor.amlogic.display.meson_display_ipc</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>IMesonDisplayIPC</name> + <instance>default</instance> + </interface> + </hal> +</compatibility-matrix> diff --git a/hidl_manifests/newdevices/manifest_boot.xml b/hidl_manifests/newdevices/manifest_boot.xml new file mode 100644 index 0000000..2bd7169 --- a/dev/null +++ b/hidl_manifests/newdevices/manifest_boot.xml @@ -0,0 +1,11 @@ +<manifest version="1.0" type="device" target-level="5"> + <hal format="hidl"> + <name>android.hardware.boot</name> + <transport>hwbinder</transport> + <version>1.1</version> + <interface> + <name>IBootControl</name> + <instance>default</instance> + </interface> + </hal> +</manifest> diff --git a/hidl_manifests/newdevices/manifest_cas.xml b/hidl_manifests/newdevices/manifest_cas.xml new file mode 100644 index 0000000..24d8df8 --- a/dev/null +++ b/hidl_manifests/newdevices/manifest_cas.xml @@ -0,0 +1,11 @@ +<manifest version="1.0" type="device" target-level="5"> + <hal format="hidl" optional="true"> + <name>android.hardware.cas</name> + <transport>hwbinder</transport> + <version>1.1-2</version> + <interface> + <name>IMediaCasService</name> + <instance>default</instance> + </interface> + </hal> +</manifest> diff --git a/hidl_manifests/newdevices/manifest_common.xml b/hidl_manifests/newdevices/manifest_common.xml new file mode 100644 index 0000000..49235f8 --- a/dev/null +++ b/hidl_manifests/newdevices/manifest_common.xml @@ -0,0 +1,169 @@ +<manifest version="1.0" type="device" target-level="5"> + <hal format="hidl"> + <name>android.hardware.bluetooth</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>IBluetoothHci</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.power</name> + <transport>hwbinder</transport> + <interface> + <name>IPower</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.memtrack</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>IMemtrack</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.audio</name> + <transport>hwbinder</transport> + <version>6.0</version> + <interface> + <name>IDevicesFactory</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.audio.effect</name> + <transport>hwbinder</transport> + <version>6.0</version> + <interface> + <name>IEffectsFactory</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.graphics.allocator</name> + <transport>hwbinder</transport> + <version>3.0</version> + <interface> + <name>IAllocator</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.graphics.mapper</name> + <transport arch="32+64">passthrough</transport> + <version>3.0</version> + <interface> + <name>IMapper</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.camera.provider</name> + <transport>hwbinder</transport> + <version>2.5</version> + <interface> + <name>ICameraProvider</name> + <instance>legacy/0</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.media.omx</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>IOmx</name> + <instance>default</instance> + </interface> + <interface> + <name>IOmxStore</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.keymaster</name> + <transport>hwbinder</transport> + <version>4.1</version> + <interface> + <name>IKeymasterDevice</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.drm</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>ICryptoFactory</name> + <instance>default</instance> + <instance>widevine</instance> + </interface> + <interface> + <name>IDrmFactory</name> + <instance>default</instance> + <instance>widevine</instance> + </interface> + <fqname>@1.3::ICryptoFactory/clearkey</fqname> + <fqname>@1.3::IDrmFactory/clearkey</fqname> + <fqname>@1.3::ICryptoFactory/widevine</fqname> + <fqname>@1.3::IDrmFactory/widevine</fqname> + <fqname>@1.3::ICryptoFactory/default</fqname> + <fqname>@1.3::IDrmFactory/default</fqname> + </hal> + <hal> + <name>android.hardware.tv.cec</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>IHdmiCec</name> + <instance>default</instance> + </interface> + </hal> + <hal> + <name>vendor.amlogic.hardware.systemcontrol</name> + <transport>hwbinder</transport> + <version>1.1</version> + <interface> + <name>ISystemControl</name> + <instance>default</instance> + </interface> + </hal> + <hal> + <name>vendor.amlogic.hardware.hdmicec</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>IDroidHdmiCEC</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.light</name> + <transport>hwbinder</transport> + <interface> + <name>ILight</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.health</name> + <transport>hwbinder</transport> + <version>2.1</version> + <interface> + <name>IHealth</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.bluetooth.audio</name> + <transport>hwbinder</transport> + <version>2.0</version> + <interface> + <name>IBluetoothAudioProvidersFactory</name> + <instance>default</instance> + </interface> + </hal> +</manifest> diff --git a/hidl_manifests/newdevices/manifest_ir.xml b/hidl_manifests/newdevices/manifest_ir.xml new file mode 100644 index 0000000..45c9618 --- a/dev/null +++ b/hidl_manifests/newdevices/manifest_ir.xml @@ -0,0 +1,11 @@ +<manifest version="1.0" type="device" target-level="5"> + <hal format="hidl"> + <name>android.hardware.ir</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>IConsumerIr</name> + <instance>default</instance> + </interface> + </hal> +</manifest> |