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

Commit 17c437ea authored by Steven Moreland's avatar Steven Moreland Committed by Gerrit Code Review
Browse files

Merge "Add monostate to optional safe unions."

parents 76c45692 dec52725

radio/1.3/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ hidl_interface { 
        "android.hardware.radio@1.1",

        "android.hardware.radio@1.2",

        "android.hidl.base@1.0",

        "android.hidl.safe_union@1.0",

    ],

    types: [

        "AccessNetwork",

radio/1.3/types.hal

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ import @1.2::AccessNetwork; 
import @1.2::CellIdentity;

import @1.2::DataRegStateResult;



import android.hidl.safe_union@1.0::Monostate;



enum AccessNetwork : @1.2::AccessNetwork {

    /**

     * Unknown access network
@@ -162,6 +164,8 @@ struct DataRegStateResult { 
     * will be empty when device is camped only on 2G/3G .

     */

    safe_union VopsInfo {

        Monostate noinit;



        LteVopsInfo lteVopsInfo; // LTE network capability

    } vopsInfo;

};

tests/safeunion/1.0/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ hidl_interface { 
    ],

    interfaces: [

        "android.hidl.base@1.0",

        "android.hidl.safe_union@1.0",

    ],

    gen_java: true,

}

tests/safeunion/1.0/ISafeUnion.hal

+10 −3
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package android.hardware.tests.safeunion@1.0; 


import IOtherInterface;



import android.hidl.safe_union@1.0::Monostate;



interface ISafeUnion {



    enum BitField : uint8_t {
@@ -33,14 +35,15 @@ interface ISafeUnion { 
        string j3;

    };



    safe_union EmptySafeUnion {

    };



    safe_union SmallSafeUnion {

        Monostate noinit;



        uint8_t a;

    };



    safe_union LargeSafeUnion {

        Monostate noinit;



        int8_t a;

        uint16_t b;

        int32_t c;
@@ -66,6 +69,8 @@ interface ISafeUnion { 
    };



    safe_union InterfaceTypeSafeUnion {

        Monostate noinit;



        uint32_t a;

        int8_t[7] b;

        IOtherInterface c;
@@ -76,6 +81,8 @@ interface ISafeUnion { 
    };



    safe_union HandleTypeSafeUnion {

        Monostate noinit;



        handle a;

        handle[5] b;

        vec<handle> c;