commit 488b04c912ac5ca2430c959f732a4a4f35d1d275
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed May 10 16:36:29 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed May 10 16:36:29 2023 +0000
tree f40f9460d27f7b1385d17520b98b4dae1f98ec87
parent a35c388d6011ccf146abbfd1535448b364e71853
parent a8f11449e970fd27b9f646de5122741bf729ee8d

Snap for 10102166 from a8f11449e970fd27b9f646de5122741bf729ee8d to mainline-tzdata4-release

Change-Id: I3ec2199a8990fe276577e9d130b2360233fe1c93

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