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

Commit ef8eaf4a authored by Yifan Hong's avatar Yifan Hong
Browse files

Revert old matrices back to DR / MR1. 

legacy/26/27.xml ("old matrices") should not be changed once
published.

The requirements / HAL usage information are now encompassed in
multiple matrices (instead of a single compatibility_matrix.V.xml).
For example, the usage of HALs on Shipping FCM Version 26 is:
* Required HALs in 26.xml
* Using all required + optional HALs in 26.xml/27.xml/...

In particular,

* Starting at 26.xml (diff legacy 26), gatekeeper is required.
* Starting at 27.xml (diff 26 27),
   - broadcastradio@1.0 => 1.0-1
   - introduce cas@1.0
   - introduce oemlock@1.0
   - power@1.0 => 1.0-1
   - radio@1.0 => 1.0-1
   - introduce tetheroffload.config@1.0
   - introduce tetheroffload.control@1.0
   - thermal@1.0 => 1.0-1
   - usb@1.0 => 1.0-1
   - vibrator@1.0 => 1.0-1
   - wifi@1.0 => 1.0-1
   - introduce weaver@1.0
   - introduce wifi.offload@1.0

health@2.0 and configstore@1.1 is not specified
in legacy/26/27.xml, but framework can still use them, since they
are introduced in current.xml.

Test: boot test

Bug: 69861676
Change-Id: I897df6952245a8ce33e1c63264c3970b0483c2f7
parent 85738940

compatibility_matrix.26.xml

+8 −64
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
    </hal>

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

        <name>android.hardware.broadcastradio</name>

        <version>1.0-1</version>

        <version>1.0</version>

        <interface>

            <name>IBroadcastRadioFactory</name>

            <instance>default</instance>
@@ -71,17 +71,9 @@ 
            <instance>legacy/0</instance>

        </interface>

    </hal>

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

        <name>android.hardware.cas</name>

        <version>1.0</version>

        <interface>

            <name>IMediaCasService</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.configstore</name>

        <version>1.0-1</version>

        <version>1.0</version>

        <interface>

            <name>ISurfaceFlingerConfigs</name>

            <instance>default</instance>
@@ -163,14 +155,6 @@ 
            <instance>default</instance>

        </interface>

    </hal>

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

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

        <version>2.0</version>

        <interface>

            <name>IHealth</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.ir</name>

        <version>1.0</version>
@@ -219,17 +203,9 @@ 
            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.oemlock</name>

        <version>1.0</version>

        <interface>

            <name>IOemLock</name>

            <instance>default</instance>

        </interface>

    </hal>

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

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

        <version>1.0-1</version>

        <version>1.0</version>

        <interface>

            <name>IPower</name>

            <instance>default</instance>
@@ -237,7 +213,7 @@ 
    </hal>

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

        <name>android.hardware.radio</name>

        <version>1.0-1</version>

        <version>1.0</version>

        <interface>

            <name>IRadio</name>

            <instance>slot1</instance>
@@ -279,25 +255,9 @@ 
            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.tetheroffload.config</name>

        <version>1.0</version>

        <interface>

            <name>IOffloadConfig</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.tetheroffload.control</name>

        <version>1.0</version>

        <interface>

            <name>IOffloadControl</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.thermal</name>

        <version>1.0-1</version>

        <version>1.0</version>

        <interface>

            <name>IThermal</name>

            <instance>default</instance>
@@ -321,7 +281,7 @@ 
    </hal>

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

        <name>android.hardware.usb</name>

        <version>1.0-1</version>

        <version>1.0</version>

        <interface>

            <name>IUsb</name>

            <instance>default</instance>
@@ -329,7 +289,7 @@ 
    </hal>

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

        <name>android.hardware.vibrator</name>

        <version>1.0-1</version>

        <version>1.0</version>

        <interface>

            <name>IVibrator</name>

            <instance>default</instance>
@@ -343,27 +303,11 @@ 
            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.weaver</name>

        <version>1.0</version>

        <interface>

            <name>IWeaver</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.wifi</name>

        <version>1.0-1</version>

        <interface>

            <name>IWifi</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.wifi.offload</name>

        <version>1.0</version>

        <interface>

            <name>IOffload</name>

            <name>IWifi</name>

            <instance>default</instance>

        </interface>

    </hal>

compatibility_matrix.27.xml

+0 −8
Original line number Diff line number Diff line
@@ -163,14 +163,6 @@ 
            <instance>default</instance>

        </interface>

    </hal>

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

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

        <version>2.0</version>

        <interface>

            <name>IHealth</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.ir</name>

        <version>1.0</version>

compatibility_matrix.legacy.xml

+8 −64
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
    </hal>

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

        <name>android.hardware.broadcastradio</name>

        <version>1.0-1</version>

        <version>1.0</version>

        <interface>

            <name>IBroadcastRadioFactory</name>

            <instance>default</instance>
@@ -71,17 +71,9 @@ 
            <instance>legacy/0</instance>

        </interface>

    </hal>

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

        <name>android.hardware.cas</name>

        <version>1.0</version>

        <interface>

            <name>IMediaCasService</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.configstore</name>

        <version>1.0-1</version>

        <version>1.0</version>

        <interface>

            <name>ISurfaceFlingerConfigs</name>

            <instance>default</instance>
@@ -163,14 +155,6 @@ 
            <instance>default</instance>

        </interface>

    </hal>

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

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

        <version>2.0</version>

        <interface>

            <name>IHealth</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.ir</name>

        <version>1.0</version>
@@ -219,17 +203,9 @@ 
            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.oemlock</name>

        <version>1.0</version>

        <interface>

            <name>IOemLock</name>

            <instance>default</instance>

        </interface>

    </hal>

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

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

        <version>1.0-1</version>

        <version>1.0</version>

        <interface>

            <name>IPower</name>

            <instance>default</instance>
@@ -237,7 +213,7 @@ 
    </hal>

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

        <name>android.hardware.radio</name>

        <version>1.0-1</version>

        <version>1.0</version>

        <interface>

            <name>IRadio</name>

            <instance>slot1</instance>
@@ -279,25 +255,9 @@ 
            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.tetheroffload.config</name>

        <version>1.0</version>

        <interface>

            <name>IOffloadConfig</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.tetheroffload.control</name>

        <version>1.0</version>

        <interface>

            <name>IOffloadControl</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.thermal</name>

        <version>1.0-1</version>

        <version>1.0</version>

        <interface>

            <name>IThermal</name>

            <instance>default</instance>
@@ -321,7 +281,7 @@ 
    </hal>

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

        <name>android.hardware.usb</name>

        <version>1.0-1</version>

        <version>1.0</version>

        <interface>

            <name>IUsb</name>

            <instance>default</instance>
@@ -329,7 +289,7 @@ 
    </hal>

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

        <name>android.hardware.vibrator</name>

        <version>1.0-1</version>

        <version>1.0</version>

        <interface>

            <name>IVibrator</name>

            <instance>default</instance>
@@ -343,27 +303,11 @@ 
            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.weaver</name>

        <version>1.0</version>

        <interface>

            <name>IWeaver</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.wifi</name>

        <version>1.0-1</version>

        <interface>

            <name>IWifi</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.wifi.offload</name>

        <version>1.0</version>

        <interface>

            <name>IOffload</name>

            <name>IWifi</name>

            <instance>default</instance>

        </interface>

    </hal>