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

Commit 3390e261 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...

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

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



Change-Id: Ibf1f61c14f34f5e43fd21c0e3476679b5ffd73d7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f0c1565e 3da1fa5f
Loading
Loading
Loading
Loading
+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>
+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>
+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>
+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>
+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>
Loading