Merge "Enable screenReaderMode in xtermjs if isTouchExplorationEnabled is true" into main
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
index 83aed67..c232e37 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
@@ -93,22 +93,26 @@
runOnUiThread(() -> mWebView.loadUrl(url));
}
+ @Override
public void onVmStart() {
Log.i(TAG, "onVmStart()");
}
+ @Override
public void onVmStop() {
Toast.makeText(this, R.string.vm_stop_message, Toast.LENGTH_SHORT).show();
Log.i(TAG, "onVmStop()");
finish();
}
+ @Override
public void onVmError() {
Toast.makeText(this, R.string.vm_error_message, Toast.LENGTH_SHORT).show();
Log.i(TAG, "onVmError()");
finish();
}
+ @Override
public void onIpAddrAvailable(String ipAddr) {
mVmIpAddr = ipAddr;
((TextView) findViewById(R.id.ip_addr_textview)).setText(mVmIpAddr);
diff --git a/build/debian/kokoro/gcp_ubuntu_docker/build.sh b/build/debian/kokoro/gcp_ubuntu_docker/build.sh
index a65df9f..5023d09 100644
--- a/build/debian/kokoro/gcp_ubuntu_docker/build.sh
+++ b/build/debian/kokoro/gcp_ubuntu_docker/build.sh
@@ -9,4 +9,5 @@
tar czvS -f ${KOKORO_ARTIFACTS_DIR}/image.tar.gz image.raw
mkdir -p ${KOKORO_ARTIFACTS_DIR}/logs
-cp -r /var/log/fai/*/last/* ${KOKORO_ARTIFACTS_DIR}/logs
+# TODO(b/372162211): Find exact location of log without breaking kokoro build.
+cp -r /var/log/fai/*/last/* ${KOKORO_ARTIFACTS_DIR}/logs || true