diff options
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 13 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java | 2 |
2 files changed, 3 insertions, 12 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index 0d3e11f18..c5e19da5a 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -2143,16 +2143,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss } /** - * helper, prints the milli time since boot wi and w/o suspended time - */ - String printTime() { - StringBuilder sb = new StringBuilder(); - sb.append(" rt=").append(mClock.getUptimeSinceBootMillis()); - sb.append("/").append(mClock.getElapsedSinceBootMillis()); - return sb.toString(); - } - - /** * Return the additional string to be logged by LogRec, default * * @param msg that was processed @@ -2175,7 +2165,8 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss if (msg.sendingUid > 0 && msg.sendingUid != Process.WIFI_UID) { sb.append(" uid=" + msg.sendingUid); } - sb.append(" ").append(printTime()); + sb.append(" rt=").append(mClock.getUptimeSinceBootMillis()); + sb.append("/").append(mClock.getElapsedSinceBootMillis()); switch (msg.what) { case CMD_START_SCAN: now = mClock.getWallClockMillis(); diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java index 06fa43094..df3910b4d 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java @@ -342,7 +342,7 @@ public class WifiStateMachineTest { mWifiMonitor = new MockWifiMonitor(); when(mWifiInjector.getWifiMetrics()).thenReturn(mWifiMetrics); - when(mWifiInjector.getClock()).thenReturn(mock(Clock.class)); + when(mWifiInjector.getClock()).thenReturn(new Clock()); when(mWifiInjector.getWifiLastResortWatchdog()).thenReturn(mWifiLastResortWatchdog); when(mWifiInjector.getPropertyService()).thenReturn(mPropertyService); when(mWifiInjector.getBuildProperties()).thenReturn(mBuildProperties); |