commit 4617f41b2bea38f9406523ab9fcc1b9875bbb364
author Nick Desaulniers <ndesaulniers@google.com> Fri Oct 11 21:12:24 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Oct 11 21:12:24 2019 -0700
tree 81512a84214b467dc1ae52e6f8a72817c9a09a22
parent 68a1f9c100465596b9d46cc1821d45dcb3019afd
parent d8cc9991a001fc29946186a8dd54d9043eb5c1d5

[stats HAL] fix -Wreorder-init-list
am: d8cc9991a0

Change-Id: Ic2fa0c124bef3dbbd9ba8d2c4b4ae8584a788800

stats/1.0/test_client/StatsClient.cpp

diff --git a/stats/1.0/test_client/StatsClient.cpp b/stats/1.0/test_client/StatsClient.cpp
index 20257a8..b564161 100644
--- a/stats/1.0/test_client/StatsClient.cpp
+++ b/stats/1.0/test_client/StatsClient.cpp
@@ -141,8 +141,8 @@
                 break;
             }
             case 'u': {
-                UsbPortOverheatEvent event = {.maxTemperatureDeciC = 220,
-                                              .plugTemperatureDeciC = 210,
+                UsbPortOverheatEvent event = {.plugTemperatureDeciC = 210,
+                                              .maxTemperatureDeciC = 220,
                                               .timeToOverheat = 1,
                                               .timeToHysteresis = 2,
                                               .timeToInactive = 3};

stats/1.0/vts/functional/VtsHalStatsV1_0TargetTest.cpp

diff --git a/stats/1.0/vts/functional/VtsHalStatsV1_0TargetTest.cpp b/stats/1.0/vts/functional/VtsHalStatsV1_0TargetTest.cpp
index d7130f7..0c96c79 100644
--- a/stats/1.0/vts/functional/VtsHalStatsV1_0TargetTest.cpp
+++ b/stats/1.0/vts/functional/VtsHalStatsV1_0TargetTest.cpp
@@ -128,8 +128,8 @@
 
 // Sanity check IStats::reportUsbPortOverheatEvent.
 TEST_F(StatsHidlTest, reportUsbPortOverheatEvent) {
-    UsbPortOverheatEvent event = {.maxTemperatureDeciC = 220,
-                                  .plugTemperatureDeciC = 210,
+    UsbPortOverheatEvent event = {.plugTemperatureDeciC = 210,
+                                  .maxTemperatureDeciC = 220,
                                   .timeToOverheat = 1,
                                   .timeToHysteresis = 2,
                                   .timeToInactive = 3};