Merge changes from topics "ngran", "update_ngran" am: ca0e5aa890

am: 16be1378f6

Change-Id: Ifcfc1d0d0875b6b918bbb38c5077678584ef194c
This commit is contained in:
Sarah Chin 2019-12-05 13:55:55 -08:00 committed by android-build-merger
commit 4743af25e5
2 changed files with 10 additions and 3 deletions

View file

@ -604,7 +604,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
521d1fe5b9f212b7b37ab71c0d33f5d2622618837e318e99a80d882f186af6b9 android.hardware.radio@1.5::types
35cd6586225912718c599421606d69260707e43732d874f2064e28de45c87fac android.hardware.radio@1.5::types
3f1e2410d9bed4e7d41c6a589fe3a7943bc904b0066e40e0199a7c58427ac4e9 android.hardware.radio@1.5::IRadio
3afac66f21a33bc9c4b80481c7d5540038348651d9a7d8af64ea13610af138da android.hardware.radio@1.5::IRadioIndication
caf00e0d942b77b17d7061b38de11e5b19e1da90d4818434cb4916ba89e30686 android.hardware.radio@1.5::IRadioResponse

View file

@ -158,7 +158,7 @@ struct RadioAccessSpecifier {
};
enum NgranBands : int32_t {
/** 3GPP TS 28.101-1, Table 5.2-1: FR1 bands */
/** 3GPP TS 38.101-1, Table 5.2-1: FR1 bands */
BAND_1 = 1,
BAND_2 = 2,
BAND_3 = 3,
@ -166,16 +166,22 @@ enum NgranBands : int32_t {
BAND_7 = 7,
BAND_8 = 8,
BAND_12 = 12,
BAND_14 = 14,
BAND_18 = 18,
BAND_20 = 20,
BAND_25 = 25,
BAND_28 = 28,
BAND_29 = 29,
BAND_30 = 30,
BAND_34 = 34,
BAND_38 = 38,
BAND_39 = 39,
BAND_40 = 40,
BAND_41 = 41,
BAND_48 = 48,
BAND_50 = 50,
BAND_51 = 51,
BAND_65 = 65,
BAND_66 = 66,
BAND_70 = 70,
BAND_71 = 71,
@ -191,7 +197,8 @@ enum NgranBands : int32_t {
BAND_83 = 83,
BAND_84 = 84,
BAND_86 = 86,
/** 3GPP TS 28.101-2, Table 5.2-1: FR2 bands */
BAND_90 = 90,
/** 3GPP TS 38.101-2, Table 5.2-1: FR2 bands */
BAND_257 = 257,
BAND_258 = 258,
BAND_260 = 260,