commit d09f9cdc9b2a03fc64baaa1a2634537a1ddb6ac0
author Diego Perez <diegoperez@google.com> Fri Jun 24 16:46:30 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 24 16:46:32 2016 +0000
tree 7ce7c4427a9e8a828cb2147bf222b1a3a45da9f2
parent af2bdea5e9ecfd7840b8d6e3e02aaf2edce952fe
parent 27f5ec1e32cbdb5e3050e7d552e01d479d8248ac

Merge "Do not set default encoding to UTF-8 in KXmlParser"

bridge/src/com/android/layoutlib/bridge/impl/ParserFactory.java

diff --git a/bridge/src/com/android/layoutlib/bridge/impl/ParserFactory.java b/bridge/src/com/android/layoutlib/bridge/impl/ParserFactory.java
index e273b2c..1ae9cb6 100644
--- a/bridge/src/com/android/layoutlib/bridge/impl/ParserFactory.java
+++ b/bridge/src/com/android/layoutlib/bridge/impl/ParserFactory.java
@@ -39,8 +39,6 @@
 
     public final static boolean LOG_PARSER = false;
 
-    private final static String ENCODING = "UTF-8"; //$NON-NLS-1$
-
     // Used to get a new XmlPullParser from the client.
     @Nullable
     private static com.android.ide.common.rendering.api.ParserFactory sParserFactory;
@@ -74,7 +72,7 @@
 
         stream = readAndClose(stream, name, size);
 
-        parser.setInput(stream, ENCODING);
+        parser.setInput(stream, null);
         if (isLayout) {
             try {
                 return new LayoutParserWrapper(parser).peekTillLayoutStart();