aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTai Kuo <taikuo@google.com>2020-07-30 18:36:21 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-30 18:36:21 +0000
commitb307393861385756555a373662d47a6c5f991aac (patch)
treeba331aa1f113ac797ec3a7c0f0008d126b7d117d
parentb87222e335a093874c39893d0a08163ca4e06086 (diff)
parent4465a367323d64c921884540bbed9ac611d283ae (diff)
downloadwalt-b307393861385756555a373662d47a6c5f991aac.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: Iec5de8591137b3eaf8e718c6a52d93b2a61f8e00
-rw-r--r--android/WALT/app/src/main/java/org/chromium/latency/walt/MainActivity.java7
-rw-r--r--android/WALT/app/src/main/java/org/chromium/latency/walt/WaltDevice.java13
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();
}