summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-01-12 23:57:50 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-01-12 23:57:50 +0000
commite6b317c8e27b2e173857f7d428a2f07ca76fb4df (patch)
treef6970764760fd55b1c12fe310013b5271375057b
parentdab1eb525729b84065deceb16b69ef93a71d8c81 (diff)
parent766b9da9353490312bfcfc64d6c0219bce7e6c32 (diff)
downloadcts-e6b317c8e27b2e173857f7d428a2f07ca76fb4df.tar.gz
Merge "Not allow dot in BRAND/PRODUCT/DEVICE/BOARD" into android11-tests-dev
-rw-r--r--tests/tests/os/src/android/os/cts/BuildTest.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/tests/os/src/android/os/cts/BuildTest.java b/tests/tests/os/src/android/os/cts/BuildTest.java
index aac47eb97cc..85392418bb7 100644
--- a/tests/tests/os/src/android/os/cts/BuildTest.java
+++ b/tests/tests/os/src/android/os/cts/BuildTest.java
@@ -207,17 +207,17 @@ public class BuildTest extends TestCase {
}
private static final Pattern BOARD_PATTERN =
- Pattern.compile("^([0-9A-Za-z._-]+)$");
+ Pattern.compile("^([0-9A-Za-z_-]+)$");
private static final Pattern BRAND_PATTERN =
- Pattern.compile("^([0-9A-Za-z._-]+)$");
+ Pattern.compile("^([0-9A-Za-z_-]+)$");
private static final Pattern DEVICE_PATTERN =
- Pattern.compile("^([0-9A-Za-z._-]+)$");
+ Pattern.compile("^([0-9A-Za-z_-]+)$");
private static final Pattern ID_PATTERN =
Pattern.compile("^([0-9A-Za-z._-]+)$");
private static final Pattern HARDWARE_PATTERN =
Pattern.compile("^([0-9A-Za-z.,_-]+)$");
private static final Pattern PRODUCT_PATTERN =
- Pattern.compile("^([0-9A-Za-z._-]+)$");
+ Pattern.compile("^([0-9A-Za-z_-]+)$");
private static final Pattern SERIAL_NUMBER_PATTERN =
Pattern.compile("^([0-9A-Za-z]{6,20})$");
private static final Pattern TAGS_PATTERN =