From caf66d02fde298fcb010668e353a156bf2d49661 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Fri, 16 Oct 2020 23:35:01 -0600
Subject: Expand formatSimple() to support widths.

One of the highest-traffic users of String.format() is in the
notification code, which uses argument widths.  To support these
use-cases, this change adds argument width support, with tests.

Bug: 170978902
Test: atest error_prone_android_framework_test
Exempt-From-Owner-Approval: trivial additions
Change-Id: I8e36d4725a6d0cc896dedc5c457eb5f38486d7b6
---
 .../errorprone/bugpatterns/android/EfficientStringsChecker.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'errorprone/java')

diff --git a/errorprone/java/com/google/errorprone/bugpatterns/android/EfficientStringsChecker.java b/errorprone/java/com/google/errorprone/bugpatterns/android/EfficientStringsChecker.java
index d2cb030faef6..3a0fbd33933f 100644
--- a/errorprone/java/com/google/errorprone/bugpatterns/android/EfficientStringsChecker.java
+++ b/errorprone/java/com/google/errorprone/bugpatterns/android/EfficientStringsChecker.java
@@ -180,8 +180,10 @@ public final class EfficientStringsChecker extends BugChecker
         for (int i = 0; i < format.length(); i++) {
             char c = format.charAt(i);
             if (c == '%') {
-                i++;
-                c = format.charAt(i);
+                c = format.charAt(++i);
+                while ('0' <= c && c <= '9') {
+                    c = format.charAt(++i);
+                }
                 switch (c) {
                     case 'b':
                     case 'c':
-- 
cgit v1.2.3-59-g8ed1b