Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cf6c930 authored by Diego Perez's avatar Diego Perez Committed by Android (Google) Code Review
Browse files

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

parents 2e33e0df 8594e952

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

+1 −3
Original line number Original line Diff line number Diff line
@@ -39,8 +39,6 @@ public class ParserFactory { 




    public final static boolean LOG_PARSER = false;

    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.

    // Used to get a new XmlPullParser from the client.

    @Nullable

    @Nullable

    private static com.android.ide.common.rendering.api.ParserFactory sParserFactory;

    private static com.android.ide.common.rendering.api.ParserFactory sParserFactory;
@@ -74,7 +72,7 @@ public class ParserFactory { 




        stream = readAndClose(stream, name, size);

        stream = readAndClose(stream, name, size);





        parser.setInput(stream, ENCODING);

        parser.setInput(stream, null);

        if (isLayout) {

        if (isLayout) {

            try {

            try {

                return new LayoutParserWrapper(parser).peekTillLayoutStart();

                return new LayoutParserWrapper(parser).peekTillLayoutStart();