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

Commit 16f92895 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Added multi-band support am: 295d9d42 am: 10a7dfb1 

Change-Id: I61f52345235c1d82c15624b258b2659246afe757
parents 6726fc9d 10a7dfb1

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -642,7 +642,7 @@ c9273429fcf98d797d3bb07fdba6f1be95bf960f9255cde169fd1ca4db85f856 android.hardwar 
##

# BEGIN Radio HAL Merge Conflict Avoidance Buffer - STOPSHIP if present

##

372abc5d0502fc40ca0b83b233addf9babc7fd459bafb908915b1371fc6f1bd0 android.hardware.radio@1.5::types

1061eb4a78cb3e0aacec075fc7811e2ac884a98e0d9e3cb3b775174c6953033c android.hardware.radio@1.5::types

603851ca0f5360778049902fc7486d0ff60065b16e83b99f076487667aba1928 android.hardware.radio@1.5::IRadio

e96ae1c3a9c0689002ec2318e9c587f4f607c16a75a3cd38788b77eb91072021 android.hardware.radio@1.5::IRadioIndication

04cce8fdae2b03becda4ee6fe17cb032fd7d30152f8ab36f642d794e4f5f6999 android.hardware.radio@1.5::IRadioResponse

radio/1.5/types.hal

+5 −2
Original line number Diff line number Diff line
@@ -597,6 +597,9 @@ struct CellIdentityLte { 


    /** Information about any closed subscriber group ID for this cell */

    OptionalCsgInfo optionalCsgInfo;



    /** Bands used by the cell. */

    vec<EutranBands> bands;

};



/**
@@ -612,8 +615,8 @@ struct CellIdentityNr { 
    /** Additional PLMN-IDs beyond the primary PLMN broadcast for this cell */

    vec<string> additionalPlmns;



    /** Band used by the cell */

    NgranBands band;

    /** Bands used by the cell. */

    vec<NgranBands> bands;

};



struct CellInfoGsm {