commit 9b25005caa4859dadf4976d48a4b21a911848281
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Mar 01 08:16:48 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Mar 01 08:16:48 2023 +0000
tree 94cac41ba365b8d9ac7eb115cfbd4749bbf50e0e
parent 33f357d27804d5a19461b38d02163ea957426d0e
parent 1265d0fa6a2fb19ca769e49dbd3177d6f508f93f

Snap for 9669149 from 1265d0fa6a2fb19ca769e49dbd3177d6f508f93f to mainline-tethering-release

Change-Id: I8cb8c2cdd56c9d5296037f4404c982dcf1aed0af

tools/vts-core-tradefed/etc/vts-tradefed

diff --git a/tools/vts-core-tradefed/etc/vts-tradefed b/tools/vts-core-tradefed/etc/vts-tradefed
index de511f2..8e07c6d 100755
--- a/tools/vts-core-tradefed/etc/vts-tradefed
+++ b/tools/vts-core-tradefed/etc/vts-tradefed
@@ -41,9 +41,9 @@
 checkPath java
 
 # check java version
-JAVA_VERSION=$(java -version 2>&1 | grep 'version [ "]\(1\.8\|9\|11\).*[ "]' | head -n 1)
+JAVA_VERSION=$(java -version 2>&1 | grep 'version [ "]\(1\.8\|9\|11\|17\).*[ "]' | head -n 1)
 if [ "${JAVA_VERSION}" == "" ]; then
-    echo "Wrong java version. 1.8, 9, or 11 is required."
+    echo "Wrong java version. 1.8, 9, 11 or 17 is required."
     exit
 fi