commit 78092380730d3453f9049870bc8311b56afe78f3
author David Su <dysu@google.com> Wed Oct 30 13:42:42 2019 -0700
committer David Su <dysu@google.com> Tue Nov 26 17:46:48 2019 -0800
tree 4f706a4677c55a1517aa953df52bcc3e849c6e45
parent b9837bcf70bde0ebe915ef86611feba47ece7f97

SL4A: Clean up WifiActivityEnergyInfo usages

Bug: 145244073
Test: compiles
Change-Id: I6f90af56767beb601c2be2fa8e0135788d51525d

Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java

diff --git a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java b/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java
index dfb47eb..9a92665 100644
--- a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java
+++ b/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java
@@ -1033,13 +1033,12 @@
     private static JSONObject buildWifiActivityEnergyInfo(
             WifiActivityEnergyInfo data) throws JSONException {
         JSONObject result = new JSONObject();
-        result.put("ControllerEnergyUsed", data.getControllerEnergyUsed());
-        result.put("ControllerIdleTimeMillis",
-                data.getControllerIdleTimeMillis());
-        result.put("ControllerRxTimeMillis", data.getControllerRxTimeMillis());
-        result.put("ControllerTxTimeMillis", data.getControllerTxTimeMillis());
+        result.put("ControllerEnergyUsed", data.getControllerEnergyUsedMicroJoules());
+        result.put("ControllerIdleTimeMillis", data.getControllerIdleDurationMillis());
+        result.put("ControllerRxTimeMillis", data.getControllerRxDurationMillis());
+        result.put("ControllerTxTimeMillis", data.getControllerTxDurationMillis());
         result.put("StackState", data.getStackState());
-        result.put("TimeStamp", data.getTimeStamp());
+        result.put("TimeStamp", data.getTimeSinceBootMillis());
         return result;
     }