Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)

Bug: 166295507
Merged-In: I6502829205ede2de914b27e6c2c5c42916af2b39
Change-Id: I7cb06511e43bd1fffd5f80a11dbdf5b1314cfe8e
This commit is contained in:
Xin Li
2020-08-28 13:05:04 -07:00
954 changed files with 78386 additions and 11949 deletions

View File

@@ -34,17 +34,46 @@
<hal format="hidl" optional="true">
<name>android.hardware.automotive.audiocontrol</name>
<version>1.0</version>
<version>2.0</version>
<interface>
<name>IAudioControl</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.automotive.evs</name>
<name>android.hardware.automotive.can</name>
<version>1.0</version>
<interface>
<name>ICanBus</name>
<regex-instance>.*</regex-instance>
</interface>
<interface>
<name>ICanController</name>
<regex-instance>.*</regex-instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.automotive.evs</name>
<version>1.0-1</version>
<interface>
<name>IEvsEnumerator</name>
<instance>default</instance>
<regex-instance>[a-z]+/[0-9]+</regex-instance>
</interface>
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.automotive.occupant_awareness</name>
<interface>
<name>IOccupantAwareness</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.automotive.sv</name>
<version>1.0</version>
<interface>
<name>ISurroundViewService</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
@@ -57,7 +86,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.biometrics.face</name>
<version>1.0</version>
<version>1.0-1</version>
<interface>
<name>IBiometricsFace</name>
<instance>default</instance>
@@ -65,7 +94,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.biometrics.fingerprint</name>
<version>2.1</version>
<version>2.1-2</version>
<interface>
<name>IBiometricsFingerprint</name>
<instance>default</instance>
@@ -113,7 +142,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.camera.provider</name>
<version>2.4-5</version>
<version>2.4-6</version>
<interface>
<name>ICameraProvider</name>
<regex-instance>[^/]+/[0-9]+</regex-instance>
@@ -121,20 +150,12 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.cas</name>
<version>1.1</version>
<version>1.1-2</version>
<interface>
<name>IMediaCasService</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.configstore</name>
<version>1.1</version>
<interface>
<name>ISurfaceFlingerConfigs</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.confirmationui</name>
<version>1.0</version>
@@ -145,7 +166,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.contexthub</name>
<version>1.0</version>
<version>1.0-1</version>
<interface>
<name>IContexthub</name>
<instance>default</instance>
@@ -153,7 +174,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.drm</name>
<version>1.0-2</version>
<version>1.3</version>
<interface>
<name>ICryptoFactory</name>
<regex-instance>.*</regex-instance>
@@ -181,7 +202,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.gnss</name>
<version>2.0</version>
<version>2.0-1</version>
<interface>
<name>IGnss</name>
<instance>default</instance>
@@ -189,8 +210,10 @@
</hal>
<hal format="hidl" optional="false">
<name>android.hardware.graphics.allocator</name>
<!-- New, non-Go devices should use 4.0, tested in vts_treble_vintf_vendor_test -->
<version>2.0</version>
<version>3.0</version>
<version>4.0</version>
<interface>
<name>IAllocator</name>
<instance>default</instance>
@@ -198,7 +221,7 @@
</hal>
<hal format="hidl" optional="false">
<name>android.hardware.graphics.composer</name>
<version>2.1-3</version>
<version>2.1-4</version>
<interface>
<name>IComposer</name>
<instance>default</instance>
@@ -206,8 +229,10 @@
</hal>
<hal format="hidl" optional="false">
<name>android.hardware.graphics.mapper</name>
<!-- New, non-Go devices should use 4.0, tested in vts_treble_vintf_vendor_test -->
<version>2.1</version>
<version>3.0</version>
<version>4.0</version>
<interface>
<name>IMapper</name>
<instance>default</instance>
@@ -269,14 +294,6 @@
<instance>strongbox</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.light</name>
<version>2.0</version>
<interface>
<name>ILight</name>
<instance>default</instance>
</interface>
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.light</name>
<interface>
@@ -286,7 +303,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.media.c2</name>
<version>1.0</version>
<version>1.0-1</version>
<interface>
<name>IComponentStore</name>
<regex-instance>default[0-9]*</regex-instance>
@@ -354,6 +371,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.radio</name>
<version>1.4</version>
<version>1.5</version>
<interface>
<name>IRadio</name>
@@ -389,6 +407,13 @@
<instance>default</instance>
</interface>
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.rebootescrow</name>
<interface>
<name>IRebootEscrow</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.secure_element</name>
<version>1.0-2</version>
@@ -401,7 +426,7 @@
<hal format="hidl" optional="true">
<name>android.hardware.sensors</name>
<version>1.0</version>
<version>2.0</version>
<version>2.0-1</version>
<interface>
<name>ISensors</name>
<instance>default</instance>
@@ -409,7 +434,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.soundtrigger</name>
<version>2.0-2</version>
<version>2.0-3</version>
<interface>
<name>ISoundTriggerHw</name>
<instance>default</instance>
@@ -455,6 +480,14 @@
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.tv.tuner</name>
<version>1.0</version>
<interface>
<name>ITuner</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.usb</name>
<version>1.0-2</version>
@@ -465,7 +498,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.usb.gadget</name>
<version>1.0</version>
<version>1.0-1</version>
<interface>
<name>IUsbGadget</name>
<instance>default</instance>
@@ -496,7 +529,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.wifi</name>
<version>1.0-3</version>
<version>1.0-4</version>
<interface>
<name>IWifi</name>
<instance>default</instance>
@@ -504,7 +537,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.wifi.hostapd</name>
<version>1.0-1</version>
<version>1.0-2</version>
<interface>
<name>IHostapd</name>
<instance>default</instance>
@@ -512,7 +545,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.wifi.supplicant</name>
<version>1.0-2</version>
<version>1.0-3</version>
<interface>
<name>ISupplicant</name>
<instance>default</instance>

View File

@@ -34,17 +34,46 @@
<hal format="hidl" optional="true">
<name>android.hardware.automotive.audiocontrol</name>
<version>1.0</version>
<version>2.0</version>
<interface>
<name>IAudioControl</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.automotive.evs</name>
<name>android.hardware.automotive.can</name>
<version>1.0</version>
<interface>
<name>ICanBus</name>
<regex-instance>.*</regex-instance>
</interface>
<interface>
<name>ICanController</name>
<regex-instance>.*</regex-instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.automotive.evs</name>
<version>1.0-1</version>
<interface>
<name>IEvsEnumerator</name>
<instance>default</instance>
<regex-instance>[a-z]+/[0-9]+</regex-instance>
</interface>
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.automotive.occupant_awareness</name>
<interface>
<name>IOccupantAwareness</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.automotive.sv</name>
<version>1.0</version>
<interface>
<name>ISurroundView</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
@@ -57,7 +86,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.biometrics.face</name>
<version>1.0</version>
<version>1.0-1</version>
<interface>
<name>IBiometricsFace</name>
<instance>default</instance>
@@ -65,7 +94,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.biometrics.fingerprint</name>
<version>2.1</version>
<version>2.1-2</version>
<interface>
<name>IBiometricsFingerprint</name>
<instance>default</instance>
@@ -113,7 +142,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.camera.provider</name>
<version>2.4-5</version>
<version>2.4-6</version>
<interface>
<name>ICameraProvider</name>
<regex-instance>[^/]+/[0-9]+</regex-instance>
@@ -121,7 +150,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.cas</name>
<version>1.1</version>
<version>1.1-2</version>
<interface>
<name>IMediaCasService</name>
<instance>default</instance>
@@ -137,7 +166,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.contexthub</name>
<version>1.0</version>
<version>1.0-1</version>
<interface>
<name>IContexthub</name>
<instance>default</instance>
@@ -145,7 +174,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.drm</name>
<version>1.0-2</version>
<version>1.3</version>
<interface>
<name>ICryptoFactory</name>
<regex-instance>.*</regex-instance>
@@ -173,7 +202,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.gnss</name>
<version>2.0</version>
<version>2.0-1</version>
<interface>
<name>IGnss</name>
<instance>default</instance>
@@ -181,8 +210,10 @@
</hal>
<hal format="hidl" optional="false">
<name>android.hardware.graphics.allocator</name>
<!-- New, non-Go devices should use 4.0, tested in vts_treble_vintf_vendor_test -->
<version>2.0</version>
<version>3.0</version>
<version>4.0</version>
<interface>
<name>IAllocator</name>
<instance>default</instance>
@@ -190,7 +221,7 @@
</hal>
<hal format="hidl" optional="false">
<name>android.hardware.graphics.composer</name>
<version>2.1-3</version>
<version>2.1-4</version>
<interface>
<name>IComposer</name>
<instance>default</instance>
@@ -198,8 +229,10 @@
</hal>
<hal format="hidl" optional="false">
<name>android.hardware.graphics.mapper</name>
<!-- New, non-Go devices should use 4.0, tested in vts_treble_vintf_vendor_test -->
<version>2.1</version>
<version>3.0</version>
<version>4.0</version>
<interface>
<name>IMapper</name>
<instance>default</instance>
@@ -261,14 +294,6 @@
<instance>strongbox</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.light</name>
<version>2.0</version>
<interface>
<name>ILight</name>
<instance>default</instance>
</interface>
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.light</name>
<interface>
@@ -278,7 +303,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.media.c2</name>
<version>1.0</version>
<version>1.0-1</version>
<interface>
<name>IComponentStore</name>
<regex-instance>default[0-9]*</regex-instance>
@@ -381,6 +406,13 @@
<instance>default</instance>
</interface>
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.rebootescrow</name>
<interface>
<name>IRebootEscrow</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.secure_element</name>
<version>1.0-2</version>
@@ -393,7 +425,7 @@
<hal format="hidl" optional="true">
<name>android.hardware.sensors</name>
<version>1.0</version>
<version>2.0</version>
<version>2.0-1</version>
<interface>
<name>ISensors</name>
<instance>default</instance>
@@ -401,7 +433,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.soundtrigger</name>
<version>2.0-2</version>
<version>2.0-3</version>
<interface>
<name>ISoundTriggerHw</name>
<instance>default</instance>
@@ -447,6 +479,14 @@
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.tv.tuner</name>
<version>1.0</version>
<interface>
<name>ITuner</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.usb</name>
<version>1.0-2</version>
@@ -457,7 +497,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.usb.gadget</name>
<version>1.0</version>
<version>1.0-1</version>
<interface>
<name>IUsbGadget</name>
<instance>default</instance>
@@ -488,7 +528,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.wifi</name>
<version>1.0-3</version>
<version>1.0-4</version>
<interface>
<name>IWifi</name>
<instance>default</instance>
@@ -496,7 +536,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.wifi.hostapd</name>
<version>1.0-1</version>
<version>1.0-2</version>
<interface>
<name>IHostapd</name>
<instance>default</instance>
@@ -504,7 +544,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.wifi.supplicant</name>
<version>1.0-2</version>
<version>1.0-3</version>
<interface>
<name>ISupplicant</name>
<instance>default</instance>