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

Commit 4ac9ebed authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "All hals are marked optional in compatibility matrices (Q~T)" am: d1129e07 am: 439438ca 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2413140



Change-Id: I95188fcbc5acdfda4690f095936216e65b895c9c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4ee28d73 439438ca

compatibility_matrices/compatibility_matrix.4.xml

+4 −4
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

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

        <name>android.hardware.audio</name>

        <version>5.0</version>

        <interface>
@@ -15,7 +15,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

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

        <name>android.hardware.audio.effect</name>

        <version>5.0</version>

        <interface>
@@ -199,7 +199,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

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

        <name>android.hardware.graphics.composer</name>

        <version>2.1-3</version>

        <interface>
@@ -207,7 +207,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

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

        <name>android.hardware.graphics.mapper</name>

        <version>2.1</version>

        <version>3.0</version>

compatibility_matrices/compatibility_matrix.5.xml

+5 −5
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

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

        <name>android.hardware.audio</name>

        <version>6.0</version>

        <interface>
@@ -15,7 +15,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

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

        <name>android.hardware.audio.effect</name>

        <version>6.0</version>

        <interface>
@@ -222,7 +222,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

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

        <name>android.hardware.graphics.composer</name>

        <version>2.1-4</version>

        <interface>
@@ -230,7 +230,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

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

        <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>
@@ -367,7 +367,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

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

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

        <name>android.hardware.power</name>

        <interface>

            <name>IPower</name>

compatibility_matrices/compatibility_matrix.6.xml

+5 −5
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

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

        <name>android.hardware.audio</name>

        <version>6.0</version>

        <version>7.0</version>
@@ -16,7 +16,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

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

        <name>android.hardware.audio.effect</name>

        <version>6.0</version>

        <version>7.0</version>
@@ -252,7 +252,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

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

        <name>android.hardware.graphics.composer</name>

        <version>2.1-4</version>

        <interface>
@@ -260,7 +260,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

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

        <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>
@@ -423,7 +423,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

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

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

        <name>android.hardware.power</name>

        <version>1-2</version>

        <interface>

compatibility_matrices/compatibility_matrix.7.xml

+2 −2
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

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

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

        <name>android.hardware.health</name>

        <version>1</version>

        <interface>
@@ -493,7 +493,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

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

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

        <name>android.hardware.power</name>

        <version>2-3</version>

        <interface>