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

Commit 218ea408 authored by Rambo Wang's avatar Rambo Wang Committed by Nathan Harold
Browse files

Update Barring HAL Structures to nest single-use unions/structs 

Bug: 148102466
Test: compilation for both cuttlefish and sargo
Merged-In: I8a8e734011909b038c0d735c2bfde7ea773b71e6
Change-Id: I8a8e734011909b038c0d735c2bfde7ea773b71e6
(cherry picked from commit 24c3416b)
parent 666a2d3d

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -643,7 +643,7 @@ a64467bae843569f0d465c5be7f0c7a5b987985b55a3ef4794dd5afc68538650 android.hardwar 
619fc9839ec6e369cfa9b28e3e9412e6885720ff8f9b5750c1b6ffb905120391 android.hardware.wifi.supplicant@1.3::ISupplicantStaIfaceCallback

c9273429fcf98d797d3bb07fdba6f1be95bf960f9255cde169fd1ca4db85f856 android.hardware.wifi.supplicant@1.3::ISupplicantStaNetwork

9b0a3ab6f4f74b971ed094426d8a443e29b512ff03e1ab50c07156396cdb2483 android.hardware.wifi.supplicant@1.3::types

b0c291c1ee1592b7b12f7bf02bad4cec4bf4f2e41fbd044a9c3885b188114c88 android.hardware.radio@1.5::types

e7669bddacbdaee2cd9a87762a13fb7648639eead54bf4d767dc06eaaeb35736 android.hardware.radio@1.5::types

b454df853441c12f6e425e8a60dd29fda20f5e6e39b93d1103e4b37495db38aa android.hardware.radio@1.5::IRadio

fcbb0742a88215ee7a6d7ce0825d253eb2b50391fc6c8c48667f9fd7f6d4549e android.hardware.radio@1.5::IRadioIndication

b809193970a91ca637a4b0184767315601d32e3ef3d5992ffbc7a8d14a14f015 android.hardware.radio@1.5::IRadioResponse

radio/1.5/types.hal

+102 −111
Original line number Diff line number Diff line
@@ -695,6 +695,7 @@ safe_union CellIdentity { 
    CellIdentityNr nr;

};



struct BarringInfo {

    /**

     * Combined list of barring services for UTRAN, EUTRAN, and NGRAN.

     *
@@ -703,7 +704,7 @@ safe_union CellIdentity { 
     * -EUTRAN - 3gpp 36.331 Sec 6.3.1 SystemInformationBlockType2

     * -NGRAN - 3gpp 38.331 Sec 6.3.2 UAC-BarringInfo and 22.261 Sec 6.22.2.[2-3]

     */

enum BarringServiceType : int32_t {

    enum ServiceType : int32_t {

        /** Applicable to UTRAN */

        /** Barring for all CS services, including registration */

        CS_SERVICE,
@@ -763,8 +764,9 @@ enum BarringServiceType : int32_t { 
        OPERATOR_30 = 1030,

        OPERATOR_31 = 1031,

        OPERATOR_32 = 1032,

};

    } serviceType;



    /** The type of barring applied to the service */

    enum BarringType : int32_t {

        /** Device is not barred for the given service */

        NONE,
@@ -772,14 +774,20 @@ enum BarringType : int32_t { 
        CONDITIONAL,

        /* Device is unconditionally barred */

        UNCONDITIONAL,

};

    } barringType;



    /** Type-specific barring info if applicable */

    safe_union BarringTypeSpecificInfo {

        /** Barring type is either none or unconditional */

        Monostate noinit;



struct ConditionalBarringInfo {

        /** Must be included if barring is conditional */

        struct Conditional {

            /** The barring factor as a percentage 0-100 */

    int32_t barringFactor;

            int32_t factor;



            /** The number of seconds between re-evaluations of barring */

    int32_t barringTimeSeconds;

            int32_t timeSeconds;



            /**

             * Indicates whether barring is currently being applied.
@@ -795,25 +803,8 @@ struct ConditionalBarringInfo { 
             * despite conditional barring.

             */

            bool isBarred;

};



safe_union BarringTypeSpecificInfo {

    /** Barring type is either none or unconditional */

    Monostate noinit;



    /** Must be included if barring is conditional */

    ConditionalBarringInfo conditionalBarringInfo;

};



struct BarringInfo {

    /** Barring service */

    BarringServiceType service;



    /** The type of barring applied to the service */

    BarringType type;



    /** Type-specific barring info if applicable */

    BarringTypeSpecificInfo typeSpecificInfo;

        } conditional;

    } barringTypeSpecificInfo;

};



enum IndicationFilter : @1.2::IndicationFilter {