diff options
| author | Mukesh Agrawal <quiche@google.com> | 2017-02-23 21:19:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-02-23 21:19:43 +0000 |
| commit | ac244e09180ab5876a2d04d454b56dd75e9c5781 (patch) | |
| tree | 5b4f18473476bfad139e306b613f8bff4807be6a /tests | |
| parent | 9310e7a88e01d9b1f9c047b0b6225aa43aecca11 (diff) | |
| parent | 6e1cb80a9e4d78f3f0ab203ad1a00db37ce7e569 (diff) | |
Merge changes I15fc6862,I9f51c873
* changes:
WifiStateMachineTest: use a real Clock
WifiStateMachine: inline printTime()
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
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); |