Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42bf8fd0 authored by Devin Moore's avatar Devin Moore Committed by Android (Google) Code Review
Browse files

Merge changes from topic "hal_impl_test_auto_udc" into udc-dev 

* changes:
  Update automotive.audiocontrol manifest and compat matrix
  Update vhal manifest fragment and compat matrix
parents c3e497e1 f1d77e22

automotive/audiocontrol/aidl/default/audiocontrol-default.xml

+1 −1
Original line number Diff line number Diff line 
<manifest version="2.0" type="device">

    <hal format="aidl">

        <name>android.hardware.automotive.audiocontrol</name>

        <version>2</version>

        <version>3</version>

        <fqname>IAudioControl/default</fqname>

    </hal>

</manifest>

automotive/vehicle/aidl/impl/vhal/vhal-default-service.xml

+1 −1
Original line number Diff line number Diff line 
<manifest version="1.0" type="device">

    <hal format="aidl">

        <name>android.hardware.automotive.vehicle</name>

        <version>1</version>

        <version>2</version>

        <fqname>IVehicle/default</fqname>

    </hal>

</manifest>

compatibility_matrices/compatibility_matrix.8.xml

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
    </hal>

    <hal format="aidl" optional="true">

        <name>android.hardware.automotive.audiocontrol</name>

        <version>2</version>

        <version>2-3</version>

        <interface>

            <name>IAudioControl</name>

            <instance>default</instance>
@@ -103,6 +103,7 @@ 
    </hal>

    <hal format="aidl" optional="true">

        <name>android.hardware.automotive.vehicle</name>

        <version>1-2</version>

        <interface>

            <name>IVehicle</name>

            <instance>default</instance>