OSDN Git Service

If graphics wants ASCII lowercasing, it needs to ask for it.
authorElliott Hughes <enh@google.com>
Fri, 2 Aug 2013 16:31:11 +0000 (09:31 -0700)
committerElliott Hughes <enh@google.com>
Fri, 2 Aug 2013 16:31:11 +0000 (09:31 -0700)
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: I13c106985302335dbb15bb9176d35ec6b4546d4e

graphics/java/android/graphics/Color.java

index 6a4e89a..933948d 100644 (file)
@@ -217,7 +217,7 @@ public class Color {
             }
             return (int)color;
         } else {
-            Integer color = sColorNameMap.get(colorString.toLowerCase(Locale.US));
+            Integer color = sColorNameMap.get(colorString.toLowerCase(Locale.ROOT));
             if (color != null) {
                 return color;
             }
@@ -379,7 +379,7 @@ public class Color {
      * @hide
      */
     public static int getHtmlColor(String color) {
-        Integer i = sColorNameMap.get(color.toLowerCase());
+        Integer i = sColorNameMap.get(color.toLowerCase(Locale.ROOT));
         if (i != null) {
             return i;
         } else {