Replace usages of char-array loops.
Bug: b/270510095
Change-Id: Iec08b417966916c9538046948d5dc939c3b10f20
diff --git a/build.gradle b/build.gradle
index b771939..289c67a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -704,7 +704,6 @@
options.errorprone.check('UnusedVariable', CheckSeverity.OFF)
options.errorprone.check('EqualsUnsafeCast', CheckSeverity.OFF)
options.errorprone.check('TypeParameterUnusedInFormals', CheckSeverity.OFF)
- options.errorprone.check('LoopOverCharArray', CheckSeverity.OFF)
options.errorprone.check('ImmutableEnumChecker', CheckSeverity.OFF)
options.errorprone.check('BadImport', CheckSeverity.OFF)
options.errorprone.check('ComplexBooleanConstant', CheckSeverity.OFF)
diff --git a/d8_r8/main/build.gradle.kts b/d8_r8/main/build.gradle.kts
index 8334a71..9e65e62 100644
--- a/d8_r8/main/build.gradle.kts
+++ b/d8_r8/main/build.gradle.kts
@@ -51,7 +51,6 @@
options.errorprone.disable("UnusedVariable")
options.errorprone.disable("EqualsUnsafeCast")
options.errorprone.disable("TypeParameterUnusedInFormals")
- options.errorprone.disable("LoopOverCharArray")
options.errorprone.disable("ImmutableEnumChecker")
options.errorprone.disable("BadImport")
options.errorprone.disable("ComplexBooleanConstant")
diff --git a/src/main/java/com/android/tools/r8/utils/StringUtils.java b/src/main/java/com/android/tools/r8/utils/StringUtils.java
index 3ba639e..a561718 100644
--- a/src/main/java/com/android/tools/r8/utils/StringUtils.java
+++ b/src/main/java/com/android/tools/r8/utils/StringUtils.java
@@ -56,7 +56,8 @@
public static String toASCIIString(String s) {
StringBuilder builder = new StringBuilder();
- for (char ch : s.toCharArray()) {
+ for (int i = 0; i < s.length(); i++) {
+ char ch = s.charAt(i);
if (0x1f < ch && ch < 0x7f) { // 0 - 0x1f and 0x7f are control characters.
builder.append(ch);
} else {
