commit 7b6d41d1f5e9cea928405a8d272616a863854bca
author Karsten Tausche <karsten@fairphone.com> Fri Jul 07 12:36:35 2023 +0200
committer Karsten Tausche <karsten@fairphone.com> Fri Jul 07 12:36:35 2023 +0200
tree 6f8f162b1c6f16d01e94b3353340f871c681c771
parent 3a4b6dc28f4069b4ff2423b63ce79ac0ecaff357
parent f786af1508844bd516faeaf3270723c2695627f3

Merge tag 'android-13.0.0_r52' into int/13/fp3

Android 13.0.0 Release 52 (TQ3A.230605.012)

* tag 'android-13.0.0_r52':
  Add Java 17 as a known version

Change-Id: I0e2c8777a87401b91bf3470a58b063cf70a50515

tools/csuite-tradefed/src/scripts/csuite-tradefed

diff --git a/tools/csuite-tradefed/src/scripts/csuite-tradefed b/tools/csuite-tradefed/src/scripts/csuite-tradefed
index f3b887a..1de0f6b 100644
--- a/tools/csuite-tradefed/src/scripts/csuite-tradefed
+++ b/tools/csuite-tradefed/src/scripts/csuite-tradefed
@@ -35,9 +35,9 @@
 checkPath java
 
 # Check the 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