Merge "Update HAL Bands" am: c3bfce6359

Change-Id: I253640e09d1374279d6ad5bcba6778519a531167
This commit is contained in:
Sarah Chin 2020-04-15 21:23:41 +00:00 committed by Automerger Merge Worker
commit d8e9eddb04
2 changed files with 33 additions and 1 deletions

View file

@ -646,7 +646,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
6b8dcd5e3e33a524cc7ebb14671a76ad3a2d333467397ce82acc4024346386f8 android.hardware.radio@1.5::types
a5bcd595a5108312fe2eb402e716d0b7dab8eb689a2a5f54fdef3ff71f3babd5 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

View file

@ -203,6 +203,9 @@ struct RadioAccessSpecifier {
vec<int32_t> channels;
};
/**
* IRadio 1.5 supports NGRAN bands up to V16.2.0
*/
enum NgranBands : int32_t {
/** 3GPP TS 38.101-1, Table 5.2-1: FR1 bands */
BAND_1 = 1,
@ -243,7 +246,13 @@ enum NgranBands : int32_t {
BAND_83 = 83,
BAND_84 = 84,
BAND_86 = 86,
BAND_89 = 89,
BAND_90 = 90,
BAND_91 = 91,
BAND_92 = 92,
BAND_93 = 93,
BAND_94 = 94,
BAND_95 = 95,
/** 3GPP TS 38.101-2, Table 5.2-1: FR2 bands */
BAND_257 = 257,
BAND_258 = 258,
@ -251,6 +260,10 @@ enum NgranBands : int32_t {
BAND_261 = 261,
};
/**
* Extended from @1.1 UtranBands to add TD-SCDMA bands
* IRadio 1.5 supports UTRAN bands up to V15.0.0
*/
enum UtranBands : @1.1::UtranBands {
/** TD-SCDMA bands. 3GPP TS 25.102, Table 5.2: Frequency bands */
BAND_A = 101,
@ -261,6 +274,25 @@ enum UtranBands : @1.1::UtranBands {
BAND_F = 106,
};
/**
* Extended from @1.1 EutranBands to add more bands from 3GPP TS 36.101, Table 5.5: Operating bands
* IRadio 1.5 supports EUTRAN bands up to V16.4.0
*/
enum EutranBands : @1.1::EutranBands {
BAND_49 = 49,
BAND_50 = 50,
BAND_51 = 51,
BAND_52 = 52,
BAND_53 = 53,
BAND_71 = 71,
BAND_72 = 72,
BAND_73 = 73,
BAND_74 = 74,
BAND_85 = 85,
BAND_87 = 87,
BAND_88 = 88,
};
/**
* Overwritten from @1.2::NetworkScanRequest to update RadioAccessSpecifier to 1.5 version.
*/