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

Commit 3da1fa5f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "FCM: add c2 software, IConfigurable instances" into main am: 75275ce5 am: 33fcf56f 

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



Change-Id: Ia81a3e1b894fbb55c01387a54ed65de3a0a25758
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7cafdb30 33fcf56f

compatibility_matrices/compatibility_matrix.4.xml

+6 −0
Original line number Diff line number Diff line
@@ -281,9 +281,15 @@ 
        <version>1.0</version>

        <interface>

            <name>IComponentStore</name>

            <instance>software</instance>

            <regex-instance>default[0-9]*</regex-instance>

            <regex-instance>vendor[0-9]*_software</regex-instance>

        </interface>

        <interface>

            <name>IConfigurable</name>

            <instance>default</instance>

            <instance>software</instance>

        </interface>

    </hal>

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

        <name>android.hardware.media.omx</name>

compatibility_matrices/compatibility_matrix.5.xml

+10 −0
Original line number Diff line number Diff line
@@ -319,10 +319,20 @@ 
        <version>1.0-1</version>

        <interface>

            <name>IComponentStore</name>

            <instance>software</instance>

            <regex-instance>default[0-9]*</regex-instance>

            <regex-instance>vendor[0-9]*_software</regex-instance>

        </interface>

    </hal>

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

        <name>android.hardware.media.c2</name>

        <version>1.0</version>

        <interface>

            <name>IConfigurable</name>

            <instance>default</instance>

            <instance>software</instance>

        </interface>

    </hal>

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

        <name>android.hardware.media.omx</name>

        <version>1.0</version>

compatibility_matrices/compatibility_matrix.6.xml

+10 −0
Original line number Diff line number Diff line
@@ -368,10 +368,20 @@ 
        <version>1.0-2</version>

        <interface>

            <name>IComponentStore</name>

            <instance>software</instance>

            <regex-instance>default[0-9]*</regex-instance>

            <regex-instance>vendor[0-9]*_software</regex-instance>

        </interface>

    </hal>

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

        <name>android.hardware.media.c2</name>

        <version>1.0</version>

        <interface>

            <name>IConfigurable</name>

            <instance>default</instance>

            <instance>software</instance>

        </interface>

    </hal>

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

        <name>android.hardware.media.omx</name>

        <version>1.0</version>

compatibility_matrices/compatibility_matrix.7.xml

+10 −0
Original line number Diff line number Diff line
@@ -430,10 +430,20 @@ 
        <version>1.0-2</version>

        <interface>

            <name>IComponentStore</name>

            <instance>software</instance>

            <regex-instance>default[0-9]*</regex-instance>

            <regex-instance>vendor[0-9]*_software</regex-instance>

        </interface>

    </hal>

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

        <name>android.hardware.media.c2</name>

        <version>1.0</version>

        <interface>

            <name>IConfigurable</name>

            <instance>default</instance>

            <instance>software</instance>

        </interface>

    </hal>

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

        <name>android.hardware.media.omx</name>

        <version>1.0</version>

compatibility_matrices/compatibility_matrix.8.xml

+10 −0
Original line number Diff line number Diff line
@@ -361,10 +361,20 @@ 
        <version>1.0-2</version>

        <interface>

            <name>IComponentStore</name>

            <instance>software</instance>

            <regex-instance>default[0-9]*</regex-instance>

            <regex-instance>vendor[0-9]*_software</regex-instance>

        </interface>

    </hal>

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

        <name>android.hardware.media.c2</name>

        <version>1.0</version>

        <interface>

            <name>IConfigurable</name>

            <instance>default</instance>

            <instance>software</instance>

        </interface>

    </hal>

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

        <name>android.hardware.memtrack</name>

        <version>1</version>