diff options
author | Tai Kuo <taikuo@google.com> | 2020-07-30 18:35:40 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-30 18:35:40 +0000 |
commit | 716c99f3660c7dc6d777fdde13472a5c89e9be44 (patch) | |
tree | ba331aa1f113ac797ec3a7c0f0008d126b7d117d | |
parent | 2bd4cd33a8b196d22b71c9fd4ff35426fce2b04d (diff) | |
parent | 4465a367323d64c921884540bbed9ac611d283ae (diff) | |
download | walt-716c99f3660c7dc6d777fdde13472a5c89e9be44.tar.gz |
walt: app: fix ping while WALT hardware is disconnected am: e1e74f4731 am: d274ef0c1a am: 4465a36732
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/walt/+/11895600
Change-Id: Icac553ca5cc327abb8826d4c863b5dd9f4be521e
-rw-r--r-- | android/WALT/app/src/main/java/org/chromium/latency/walt/MainActivity.java | 7 | ||||
-rw-r--r-- | android/WALT/app/src/main/java/org/chromium/latency/walt/WaltDevice.java | 13 |
2 files changed, 14 insertions, 6 deletions
diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/MainActivity.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/MainActivity.java index 2c35411..81a637b 100644 --- a/android/WALT/app/src/main/java/org/chromium/latency/walt/MainActivity.java +++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/MainActivity.java @@ -355,13 +355,8 @@ public class MainActivity extends AppCompatActivity { } public void onClickPing(View view) { - long t1 = waltDevice.clock.micros(); try { - waltDevice.command(WaltDevice.CMD_PING); - long dt = waltDevice.clock.micros() - t1; - logger.log(String.format(Locale.US, - "Ping reply in %.1fms", dt / 1000. - )); + waltDevice.ping(); } catch (IOException e) { logger.log("Error sending ping: " + e.getMessage()); } diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/WaltDevice.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/WaltDevice.java index 90d75ea..631afb8 100644 --- a/android/WALT/app/src/main/java/org/chromium/latency/walt/WaltDevice.java +++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/WaltDevice.java @@ -223,6 +223,19 @@ public class WaltDevice implements WaltConnection.ConnectionStateListener { } } + public void ping() throws IOException { + if (!isConnected() || clock == null) { + throw new IOException("Not connected to WALT"); + } + + long t1 = clock.micros(); + command(CMD_PING); + long dt = clock.micros() - t1; + logger.log(String.format(Locale.US, + "Ping reply in %.1fms", dt / 1000. + )); + } + public void syncClock() throws IOException { clock = connection.syncClock(); } |