From c9a074da5863f68919655b4e230daeca2312665a Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Wed, 2 Dec 2020 14:01:15 -0700
Subject: [PATCH] Move DateFormat.zeroPad() back to upstream.

We can only safely use TextUtils.formatSimple() when formatting
strings that don't appear in UI, since locales can use different
glyphs for representing numerals.

Bug: 174576537
Test: manual
Exempt-From-Owner-Approval: revert
Change-Id: Iafba1ccde239e3053b2a462c3d0c248795fbf5fc
---
 core/java/android/text/format/DateFormat.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/text/format/DateFormat.java b/core/java/android/text/format/DateFormat.java
index 84c209b2d063d..00ff687361826 100755
--- a/core/java/android/text/format/DateFormat.java
+++ b/core/java/android/text/format/DateFormat.java
@@ -698,7 +698,7 @@ public class DateFormat {
     }
 
     private static String zeroPad(int inValue, int inMinDigits) {
-        return TextUtils.formatSimple("%0" + inMinDigits + "d", inValue);
+        return String.format(Locale.getDefault(), "%0" + inMinDigits + "d", inValue);
     }
 
     /**