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': (60 commits)
Permit slashes in soundcard description
Permit slashes in soundcard description
DO NOT MERGE Update VTS tag version to V13_r4
DO NOT MERGE Update VTS tag version to V12.1_R6
DO NOT MERGE Update VTS tag version to V12_R8
DO NOT MERGE Update VTS tag version to V11_R12
DO NOT MERGE Update VTS tag version to V10_R16
Fix a command to get android.boot.dtbo_index
fix testVerifyOverlay not match multi dtbo_idx in bootconfig
Add Java 17 as a known version
DO NOT MERGE Update VTS tag version to V13_r3
DO NOT MERGE Update VTS tag version to V12.1_r5
DO NOT MERGE Update VTS tag version to V12_r7
DO NOT MERGE Update VTS tag version to V11_r11
DO NOT MERGE Update VTS tag version to V10_r15
DO NOT MERGE Update VTS tag version to V13_r2
DO NOT MERGE Update VTS tag version to V10_r14
DO NOT MERGE Update VTS tag version to V11_r10
DO NOT MERGE Update VTS tag version to V12_r6
DO NOT MERGE Update VTS tag version to V12.1_R4
...
Change-Id: I801415b2e4eef1a970be2a3246f82c31470da41b
diff --git a/testcases/host/firmware_dtbo_test/src/com/android/tests/firmwaredtbo/FirmwareDtboVerification.java b/testcases/host/firmware_dtbo_test/src/com/android/tests/firmwaredtbo/FirmwareDtboVerification.java
index c24dd7f..76607f9 100644
--- a/testcases/host/firmware_dtbo_test/src/com/android/tests/firmwaredtbo/FirmwareDtboVerification.java
+++ b/testcases/host/firmware_dtbo_test/src/com/android/tests/firmwaredtbo/FirmwareDtboVerification.java
@@ -208,8 +208,10 @@
// look for dtbo_idx in bootconfig first, then fall back to cmdline
// /proc/bootconfig does not exist on older devices, so command may fail
String bootconfig_cmd = "cat /proc/bootconfig |"
- + "grep -o \"'androidboot.dtbo_idx = [^ ]*'\" |"
- + "cut -d \"\\\"\" -f 2 ";
+ + "grep \"'androidboot.dtbo_idx = .*$'\" |"
+ + "cut -d \"=\" -f 2 |"
+ + "sed \"'s/[ \\\"]//g'\"";
+ CLog.d("bootconfig_cmd = %s", bootconfig_cmd);
CommandResult cmdResult = mDevice.executeShellV2Command(bootconfig_cmd);
String bootconfig_overlay_idx_string = cmdResult.getStdout().replace("\n", "");
String overlay_idx_string;
@@ -256,7 +258,8 @@
CommandStatus.SUCCESS);
ArrayList<String> overlayArg = new ArrayList<>();
for (String overlay_idx : overlay_idx_string.split(",")) {
- String overlayFileName = "dumped_dtbo." + overlay_idx.replaceAll("\\s+$", "");
+ String overlayFileName = "dumped_dtbo." +
+ overlay_idx.replaceAll("\\s+", "").replaceAll("\"", "");
File overlayFile = new File(mTemptFolder, overlayFileName);
// Push the dumped overlay dtbo files to the same direcly of ufdt_verify_overlay
File remoteOverLayFile = new File(ufdtVerifierParent, overlayFileName);
diff --git a/tools/vts-core-tradefed/Android.bp b/tools/vts-core-tradefed/Android.bp
index 78b256f..5018f7f 100644
--- a/tools/vts-core-tradefed/Android.bp
+++ b/tools/vts-core-tradefed/Android.bp
@@ -34,7 +34,7 @@
wrapper: "etc/vts-tradefed",
short_name: "VTS",
full_name: "Vendor Test Suite",
- version: "13_r1",
+ version: "13_r4",
static_libs: [
"cts-tradefed-harness",
"vts-core-tradefed-harness",
diff --git a/tools/vts-core-tradefed/etc/vts-tradefed b/tools/vts-core-tradefed/etc/vts-tradefed
index de511f2..8e07c6d 100755
--- a/tools/vts-core-tradefed/etc/vts-tradefed
+++ b/tools/vts-core-tradefed/etc/vts-tradefed
@@ -41,9 +41,9 @@
checkPath java
# check java version
-JAVA_VERSION=$(java -version 2>&1 | grep 'version [ "]\(1\.8\|9\|11\).*[ "]' | head -n 1)
+JAVA_VERSION=$(java -version 2>&1 | grep 'version [ "]\(1\.8\|9\|11\|17\).*[ "]' | head -n 1)
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