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

Commit 6e1dfef5 authored by Andrew Lassalle's avatar Andrew Lassalle Committed by Android (Google) Code Review
Browse files

Merge "Add RustDerive attributes to radio AIDL interfaces" into main

parents 2976849b cfb0d674

compatibility_matrices/compatibility_matrix.202604.xml

+9 −9
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ 
    </hal>

    <hal format="aidl">

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

        <version>3-4</version>

        <version>3-5</version>

        <interface>

            <name>IRadioConfig</name>

            <instance>default</instance>
@@ -404,7 +404,7 @@ 
    </hal>

    <hal format="aidl">

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

        <version>3-4</version>

        <version>3-5</version>

        <interface>

            <name>IRadioData</name>

            <instance>slot1</instance>
@@ -414,7 +414,7 @@ 
    </hal>

    <hal format="aidl">

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

        <version>3-4</version>

        <version>3-5</version>

        <interface>

            <name>IRadioMessaging</name>

            <instance>slot1</instance>
@@ -424,7 +424,7 @@ 
    </hal>

    <hal format="aidl">

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

        <version>3-4</version>

        <version>3-5</version>

        <interface>

            <name>IRadioModem</name>

            <instance>slot1</instance>
@@ -434,7 +434,7 @@ 
    </hal>

    <hal format="aidl">

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

        <version>3-4</version>

        <version>3-5</version>

        <interface>

            <name>IRadioNetwork</name>

            <instance>slot1</instance>
@@ -444,7 +444,7 @@ 
    </hal>

    <hal format="aidl">

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

        <version>3-4</version>

        <version>3-5</version>

        <interface>

            <name>IRadioSim</name>

            <instance>slot1</instance>
@@ -464,7 +464,7 @@ 
    </hal>

    <hal format="aidl">

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

        <version>3-4</version>

        <version>3-5</version>

        <interface>

            <name>IRadioVoice</name>

            <instance>slot1</instance>
@@ -474,7 +474,7 @@ 
    </hal>

    <hal format="aidl">

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

        <version>2-3</version>

        <version>2-4</version>

        <interface>

            <name>IRadioIms</name>

            <instance>slot1</instance>
@@ -484,7 +484,7 @@ 
    </hal>

    <hal format="aidl">

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

        <version>2-3</version>

        <version>2-4</version>

        <interface>

            <name>IImsMedia</name>

            <instance>default</instance>

radio/aidl/Android.bp

+21 −21
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ aidl_interface { 
        },



    ],

    frozen: true,

    frozen: false,



}
@@ -52,7 +52,7 @@ aidl_interface { 
    host_supported: true,

    srcs: ["android/hardware/radio/config/*.aidl"],

    stability: "vintf",

    imports: ["android.hardware.radio-V4"],

    imports: ["android.hardware.radio-V5"],

    flags: ["-Werror"],

    backend: {

        cpp: {
@@ -81,7 +81,7 @@ aidl_interface { 
        },



    ],

    frozen: true,

    frozen: false,



}
@@ -91,7 +91,7 @@ aidl_interface { 
    host_supported: true,

    srcs: ["android/hardware/radio/data/*.aidl"],

    stability: "vintf",

    imports: ["android.hardware.radio-V4"],

    imports: ["android.hardware.radio-V5"],

    flags: ["-Werror"],

    backend: {

        cpp: {
@@ -120,7 +120,7 @@ aidl_interface { 
        },



    ],

    frozen: true,

    frozen: false,

}



aidl_interface {
@@ -129,7 +129,7 @@ aidl_interface { 
    host_supported: true,

    srcs: ["android/hardware/radio/messaging/*.aidl"],

    stability: "vintf",

    imports: ["android.hardware.radio-V4"],

    imports: ["android.hardware.radio-V5"],

    flags: ["-Werror"],

    backend: {

        cpp: {
@@ -158,7 +158,7 @@ aidl_interface { 
        },



    ],

    frozen: true,

    frozen: false,

}



aidl_interface {
@@ -167,7 +167,7 @@ aidl_interface { 
    host_supported: true,

    srcs: ["android/hardware/radio/modem/*.aidl"],

    stability: "vintf",

    imports: ["android.hardware.radio-V4"],

    imports: ["android.hardware.radio-V5"],

    flags: ["-Werror"],

    backend: {

        cpp: {
@@ -196,7 +196,7 @@ aidl_interface { 
        },



    ],

    frozen: true,

    frozen: false,

}



aidl_interface {
@@ -205,7 +205,7 @@ aidl_interface { 
    host_supported: true,

    srcs: ["android/hardware/radio/network/*.aidl"],

    stability: "vintf",

    imports: ["android.hardware.radio-V4"],

    imports: ["android.hardware.radio-V5"],

    flags: ["-Werror"],

    backend: {

        cpp: {
@@ -234,7 +234,7 @@ aidl_interface { 
        },



    ],

    frozen: true,

    frozen: false,

}



aidl_interface {
@@ -274,8 +274,8 @@ aidl_interface { 
    stability: "vintf",

    flags: ["-Werror"],

    imports: [

        "android.hardware.radio-V4",

        "android.hardware.radio.config-V4",

        "android.hardware.radio-V5",

        "android.hardware.radio.config-V5",

    ],

    backend: {

        cpp: {
@@ -316,7 +316,7 @@ aidl_interface { 
        },



    ],

    frozen: true,

    frozen: false,

}



aidl_interface {
@@ -325,7 +325,7 @@ aidl_interface { 
    host_supported: true,

    srcs: ["android/hardware/radio/voice/*.aidl"],

    stability: "vintf",

    imports: ["android.hardware.radio-V4"],

    imports: ["android.hardware.radio-V5"],

    flags: ["-Werror"],

    backend: {

        cpp: {
@@ -354,7 +354,7 @@ aidl_interface { 
        },



    ],

    frozen: true,

    frozen: false,

}



aidl_interface {
@@ -363,8 +363,8 @@ aidl_interface { 
    srcs: ["android/hardware/radio/ims/media/*.aidl"],

    stability: "vintf",

    imports: [

        "android.hardware.radio-V4",

        "android.hardware.radio.data-V4",

        "android.hardware.radio-V5",

        "android.hardware.radio.data-V5",

    ],

    flags: ["-Werror"],

    backend: {
@@ -399,7 +399,7 @@ aidl_interface { 
        },



    ],

    frozen: true,

    frozen: false,

}



aidl_interface {
@@ -407,7 +407,7 @@ aidl_interface { 
    vendor_available: true,

    srcs: ["android/hardware/radio/ims/*.aidl"],

    stability: "vintf",

    imports: ["android.hardware.radio-V4"],

    imports: ["android.hardware.radio-V5"],

    flags: ["-Werror"],

    backend: {

        cpp: {
@@ -432,5 +432,5 @@ aidl_interface { 
        },



    ],

    frozen: true,

    frozen: false,

}

radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/PhoneCapability.aidl

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


package android.hardware.radio.config;

/* @hide */

@JavaDerive(toString=true) @VintfStability

@JavaDerive(toString=true) @RustDerive(Clone=true, Eq=true, PartialEq=true) @VintfStability

parcelable PhoneCapability {

  byte maxActiveData;

  byte maxActiveInternetData;

radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/SimPortInfo.aidl

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


package android.hardware.radio.config;

/* @hide */

@JavaDerive(toString=true) @VintfStability

@JavaDerive(toString=true) @RustDerive(Clone=true, Eq=true, PartialEq=true) @VintfStability

parcelable SimPortInfo {

  String iccId;

  int logicalSlotId;

radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/SimSlotStatus.aidl

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


package android.hardware.radio.config;

/* @hide */

@JavaDerive(toString=true) @VintfStability

@JavaDerive(toString=true) @RustDerive(Clone=true, Eq=true, PartialEq=true) @VintfStability

parcelable SimSlotStatus {

  int cardState;

  String atr;