commit e209f5e7e399e65f8090713011cdfe3e939d1673
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Mar 02 00:30:08 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Mar 02 00:30:08 2023 +0000
tree 4aec61afa86f5b1b19cb3cd75e3cd3f3a41571ba
parent e9833be10d48d698e27b4212e0ed7111b255cd0b
parent eccc4c88b538ad0a72f82b95faa4d4cb47d4a30e

Snap for 9673171 from eccc4c88b538ad0a72f82b95faa4d4cb47d4a30e to tm-qpr3-release

Change-Id: I203395b704a4a5ae2a7a6b2f5d0c70e05ab019a1

tools/mts-tradefed/etc/mts-tradefed

diff --git a/tools/mts-tradefed/etc/mts-tradefed b/tools/mts-tradefed/etc/mts-tradefed
index 3f5cdb5..beab93d 100755
--- a/tools/mts-tradefed/etc/mts-tradefed
+++ b/tools/mts-tradefed/etc/mts-tradefed
@@ -35,9 +35,9 @@
 checkPath java
 
 # check java version
-JAVA_VERSION=$(java -version 2>&1 | head -n 1 | grep 'version [ "]\(1\.8\|9\|11\).*[ "]')
+JAVA_VERSION=$(java -version 2>&1 | head -n 1 | grep 'version [ "]\(1\.8\|9\|11\|17\).*[ "]')
 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