commit 8f056d487608adfd4f1a7f04783d1e7cdcacd15b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Mar 02 00:30:07 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Mar 02 00:30:07 2023 +0000
tree f40f9460d27f7b1385d17520b98b4dae1f98ec87
parent 5c47d3d07847d1c0e23fcf36d1f3dd2a8667f24d
parent 54d6a5069eab1ebfc3974f54313ac492a338c391

Snap for 9673171 from 54d6a5069eab1ebfc3974f54313ac492a338c391 to tm-qpr3-release

Change-Id: I806a41cba303984e02ab81516bb5771dec5372c0

tools/cts-root-tradefed/etc/cts-root-tradefed

diff --git a/tools/cts-root-tradefed/etc/cts-root-tradefed b/tools/cts-root-tradefed/etc/cts-root-tradefed
index 31dde39..5c11f2c 100755
--- a/tools/cts-root-tradefed/etc/cts-root-tradefed
+++ b/tools/cts-root-tradefed/etc/cts-root-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