diff options
| author | Nick Desaulniers <ndesaulniers@google.com> | 2019-10-15 22:05:23 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-15 22:05:23 -0700 |
| commit | 7d36ef505c90a2768f25813be0dfa098ccc6f1de (patch) | |
| tree | 91f5cd306f8c87f903346041ea0a042a308acc0e | |
| parent | 42987814c5d7786492031e57051a89d56271a065 (diff) | |
| parent | d1785cb7f6587b303f2c318dcea4058e05a631f8 (diff) | |
| download | platform_hardware_interfaces-7d36ef505c90a2768f25813be0dfa098ccc6f1de.tar.gz platform_hardware_interfaces-7d36ef505c90a2768f25813be0dfa098ccc6f1de.tar.bz2 platform_hardware_interfaces-7d36ef505c90a2768f25813be0dfa098ccc6f1de.zip | |
Merge "[hardware][interfaces][wifi] fix -Wreorder-init-list"
am: d1785cb7f6
Change-Id: I43a36565bd9eb428e16384f5639328ac895ac71a
| -rw-r--r-- | wifi/1.3/default/tests/hidl_struct_util_unit_tests.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/wifi/1.3/default/tests/hidl_struct_util_unit_tests.cpp b/wifi/1.3/default/tests/hidl_struct_util_unit_tests.cpp index dbf7bd6113..4e9ebded12 100644 --- a/wifi/1.3/default/tests/hidl_struct_util_unit_tests.cpp +++ b/wifi/1.3/default/tests/hidl_struct_util_unit_tests.cpp @@ -170,12 +170,14 @@ TEST_F(HidlStructUtilTest, canConvertLegacyLinkLayerStatsToHidl) { legacy_hal::wifi_channel_stat channel_stat1 = { .channel = {legacy_hal::WIFI_CHAN_WIDTH_20, 2437, 2437, 0}, + .on_time = 0x1111, .cca_busy_time = 0x55, - .on_time = 0x1111}; + }; legacy_hal::wifi_channel_stat channel_stat2 = { .channel = {legacy_hal::WIFI_CHAN_WIDTH_20, 5180, 5180, 0}, + .on_time = 0x2222, .cca_busy_time = 0x66, - .on_time = 0x2222}; + }; radio.channel_stats.push_back(channel_stat1); radio.channel_stats.push_back(channel_stat2); } |