diff options
author | Ying Xu <yinxu@google.com> | 2017-06-02 00:34:54 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-06-02 00:34:54 +0000 |
commit | de2223dfbe80ea10dbf9ac517d34142f50d205e9 (patch) | |
tree | 625ca64d2139570d312eea07c89a777633b63d89 /include | |
parent | ac88f0763311ab55b0c753a94213a7ff06f14a95 (diff) | |
parent | 72eab07f24c334dbae7821f94872c10abb446477 (diff) | |
download | android_hardware_ril-de2223dfbe80ea10dbf9ac517d34142f50d205e9.tar.gz android_hardware_ril-de2223dfbe80ea10dbf9ac517d34142f50d205e9.tar.bz2 android_hardware_ril-de2223dfbe80ea10dbf9ac517d34142f50d205e9.zip |
Merge "Implement the new network scan RIL API." am: c2a8f44f11 am: b377793c42 am: 4cb7768820
am: 72eab07f24
Change-Id: If7f2f612fe0bd968325bc5c4dde58162e6a3b0fb
Diffstat (limited to 'include')
-rw-r--r-- | include/telephony/ril.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/telephony/ril.h b/include/telephony/ril.h index 12258bf..277878a 100644 --- a/include/telephony/ril.h +++ b/include/telephony/ril.h @@ -2149,16 +2149,22 @@ typedef enum { typedef struct { RIL_RadioAccessNetworks radio_access_network; // The type of network to scan. + uint32_t bands_length; // Length of bands union { RIL_GeranBands geran_bands[MAX_BANDS]; RIL_UtranBands utran_bands[MAX_BANDS]; RIL_EutranBands eutran_bands[MAX_BANDS]; } bands; + uint32_t channels_length; // Length of channels uint32_t channels[MAX_CHANNELS]; // Frequency channels to scan } RIL_RadioAccessSpecifier; typedef struct { RIL_ScanType type; // Type of the scan + int32_t interval; // Time interval in seconds + // between periodic scans, only + // valid when type=RIL_PERIODIC + uint32_t specifiers_length; // Length of specifiers RIL_RadioAccessSpecifier specifiers[MAX_RADIO_ACCESS_NETWORKS]; // Radio access networks // with bands/channels. } RIL_NetworkScanRequest; @@ -2169,9 +2175,9 @@ typedef enum { } RIL_ScanStatus; typedef struct { - RIL_ScanStatus status; // The status of the scan - uint32_t network_infos_length; // Total length of RIL_CellInfo - RIL_CellInfo* network_infos; // List of network information + RIL_ScanStatus status; // The status of the scan + uint32_t network_infos_length; // Total length of RIL_CellInfo + RIL_CellInfo_v12* network_infos; // List of network information } RIL_NetworkScanResult; /** |