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

Commit bd841e91 authored by Xin Li's avatar Xin Li Committed by Android (Google) Code Review
Browse files

Merge "Reland ag/31283254 Prepare for next year's development and bump FCM" into aosp-main-future

parents 3d27f09a 9cd33ffa
Loading
Loading
Loading
Loading
+17 −9
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@
    </hal>
    <hal format="aidl">
        <name>android.hardware.broadcastradio</name>
        <version>1-2</version>
        <version>1-3</version>
        <interface>
            <name>IBroadcastRadio</name>
            <regex-instance>.*</regex-instance>
@@ -233,7 +233,7 @@
    </hal>
    <hal format="aidl">
        <name>android.hardware.gnss</name>
        <version>2-4</version>
        <version>2-5</version>
        <interface>
            <name>IGnss</name>
            <instance>default</instance>
@@ -257,7 +257,7 @@
    </hal>
    <hal format="aidl">
        <name>android.hardware.health</name>
        <version>3</version>
        <version>3-4</version>
        <interface>
            <name>IHealth</name>
            <instance>default</instance>
@@ -380,7 +380,7 @@
    </hal>
    <hal format="aidl">
        <name>android.hardware.power</name>
        <version>5</version>
        <version>5-6</version>
        <interface>
            <name>IPower</name>
            <instance>default</instance>
@@ -543,7 +543,7 @@
    </hal>
    <hal format="aidl">
        <name>android.hardware.sensors</name>
        <version>2</version>
        <version>2-3</version>
        <interface>
            <name>ISensors</name>
            <instance>default</instance>
@@ -567,7 +567,7 @@
    </hal>
    <hal format="aidl">
        <name>android.hardware.thermal</name>
        <version>2</version>
        <version>3</version>
        <interface>
            <name>IThermal</name>
            <instance>default</instance>
@@ -607,7 +607,7 @@
    </hal>
    <hal format="aidl">
        <name>android.hardware.tv.tuner</name>
        <version>1-2</version>
        <version>1-3</version>
        <interface>
            <name>ITuner</name>
            <instance>default</instance>
@@ -615,7 +615,7 @@
    </hal>
    <hal format="aidl">
        <name>android.hardware.tv.input</name>
        <version>1-2</version>
        <version>1-3</version>
        <interface>
            <name>ITvInput</name>
            <instance>default</instance>
@@ -671,7 +671,7 @@
    </hal>
    <hal format="aidl" updatable-via-apex="true">
        <name>android.hardware.wifi</name>
        <version>1-2</version>
        <version>2-3</version>
        <interface>
            <name>IWifi</name>
            <instance>default</instance>
@@ -701,6 +701,14 @@
            <instance>default</instance>
        </interface>
    </hal>
    <hal format="aidl" optional="true">
        <name>android.hardware.tv.mediaquality</name>
        <version>1</version>
        <interface>
            <name>IMediaQuality</name>
            <instance>default</instance>
        </interface>
    </hal>
    <!-- The native mapper HAL must exist on the device -->
    <hal format="native">
        <name>mapper</name>