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

Commit 0b5e40c8 authored by Yifan Hong's avatar Yifan Hong Committed by Android (Google) Code Review
Browse files

Merge changes from topic "fcm_version" 

* changes:
  Specify FCM Version in compatibility matrices.
  Rename 26.xml=>1.xml, 27.xml=>2.xml
  Revert old matrices back to DR / MR1.
parents f6fb84e0 2b012dfb

compatibility_matrix.26.xml→compatibility_matrix.1.xml

+9 −65
Original line number Diff line number Diff line 
<compatibility-matrix version="1.0" type="framework">

<compatibility-matrix version="1.0" type="framework" level="1">

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

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

        <version>2.0</version>
@@ -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→compatibility_matrix.2.xml

+1 −9
Original line number Diff line number Diff line 
<compatibility-matrix version="1.0" type="framework">

<compatibility-matrix version="1.0" type="framework" level="2">

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

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

        <version>2.0</version>
@@ -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.current.xml

+1 −1
Original line number Diff line number Diff line 
<compatibility-matrix version="1.0" type="framework">

<compatibility-matrix version="1.0" type="framework" level="3">

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

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

        <version>2.0</version>

compatibility_matrix.legacy.xml

+9 −65
Original line number Diff line number Diff line 
<compatibility-matrix version="1.0" type="framework">

<compatibility-matrix version="1.0" type="framework" level="legacy">

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

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

        <version>2.0</version>
@@ -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>