aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-03-23 16:56:53 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-03-23 16:56:53 +0000
commit989702cbbe45c3f03f2e8f9340eb00b249161a63 (patch)
tree6f8f162b1c6f16d01e94b3353340f871c681c771
parent5791f5c5389de71c83eb4ce6a3cfa3e9e7b12b5e (diff)
parent0e1e32a0ab4c98f477634fd04d262f75e2822900 (diff)
downloadcsuite-989702cbbe45c3f03f2e8f9340eb00b249161a63.tar.gz
Snap for 9797055 from 0e1e32a0ab4c98f477634fd04d262f75e2822900 to mainline-permission-releaseaml_per_331913010aml_per_331812030android13-mainline-permission-release
Change-Id: I3d292a3ee386f4fe81bb86df78eb4566b13e3086
-rw-r--r--tools/csuite-tradefed/src/scripts/csuite-tradefed4
1 files changed, 2 insertions, 2 deletions
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 adb
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