From 295d9d42c40a13c6195c954147ea6bb4d4bd9570 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Wed, 22 Jan 2020 15:16:40 -0800 Subject: [PATCH] Added multi-band support One cell could have multiple bands assigned. One frequency could be shared by multiple bands because they have overlapping. Test: Telephony sanity tests. Bug: 131061889 Change-Id: I6018b9df8b8bd0745c3736df764f4569bea28baa Merged-In: I6018b9df8b8bd0745c3736df764f4569bea28baa --- current.txt | 2 +- radio/1.5/types.hal | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/current.txt b/current.txt index d0da8ce475..7562f38182 100644 --- a/current.txt +++ b/current.txt @@ -635,7 +635,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 diff --git a/radio/1.5/types.hal b/radio/1.5/types.hal index dd41fb2d79..9c75fff2b8 100644 --- a/radio/1.5/types.hal +++ b/radio/1.5/types.hal @@ -597,6 +597,9 @@ struct CellIdentityLte { /** Information about any closed subscriber group ID for this cell */ OptionalCsgInfo optionalCsgInfo; + + /** Bands used by the cell. */ + vec bands; }; /** @@ -612,8 +615,8 @@ struct CellIdentityNr { /** Additional PLMN-IDs beyond the primary PLMN broadcast for this cell */ vec additionalPlmns; - /** Band used by the cell */ - NgranBands band; + /** Bands used by the cell. */ + vec bands; }; struct CellInfoGsm {