Merge "Tagsoup: Use Locale.ROOT in toLowerCase"android-m-preview-2android-m-preview-1android-m-previewandroid-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1afw-test-harness-1.5master-soongmarshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-release

2 files changed, 5 insertions, 3 deletions

diff --git a/src/org/ccil/cowan/tagsoup/Parser.java b/src/org/ccil/cowan/tagsoup/Parser.java
index 41b5517..66d2922 100644
--- a/src/org/ccil/cowan/tagsoup/Parser.java
+++ b/src/org/ccil/cowan/tagsoup/Parser.java
@@ -17,6 +17,7 @@
 package org.ccil.cowan.tagsoup;
 import java.util.HashMap;
 import java.util.ArrayList;
+import java.util.Locale;
 import java.io.*;
 import java.net.URL;
 import java.net.URLConnection;
@@ -535,7 +536,7 @@ public class Parser extends DefaultHandler implements ScanHandler, XMLReader, Le
 		if (theNewElement == null) return;
 		// Currently we don't rely on Schema to canonicalize
 		// attribute names.
-		theAttributeName = makeName(buff, offset, length).toLowerCase();
+		theAttributeName = makeName(buff, offset, length).toLowerCase(Locale.ROOT);
 //		System.err.println("%% Attribute name " + theAttributeName);
 		}
 
diff --git a/src/org/ccil/cowan/tagsoup/Schema.java b/src/org/ccil/cowan/tagsoup/Schema.java
index 0d99a23..11bae59 100644
--- a/src/org/ccil/cowan/tagsoup/Schema.java
+++ b/src/org/ccil/cowan/tagsoup/Schema.java
@@ -16,6 +16,7 @@
 
 package org.ccil.cowan.tagsoup;
 import java.util.HashMap;
+import java.util.Locale;
 
 /**
 Abstract class representing a TSSL schema.
@@ -53,7 +54,7 @@ public abstract class Schema {
 
 	public void elementType(String name, int model, int memberOf, int flags) {
 		ElementType e = new ElementType(name, model, memberOf, flags, this);
-		theElementTypes.put(name.toLowerCase(), e);
+		theElementTypes.put(name.toLowerCase(Locale.ROOT), e);
 		if (memberOf == M_ROOT) theRoot = e;
 		}
 
@@ -119,7 +120,7 @@ public abstract class Schema {
 	**/
 
 	public ElementType getElementType(String name) {
-		return (ElementType)(theElementTypes.get(name.toLowerCase()));
+		return (ElementType)(theElementTypes.get(name.toLowerCase(Locale.ROOT)));
 		}
 
 	/**