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

Commit 9e9e2e73 authored by Wojciech Staszkiewicz's avatar Wojciech Staszkiewicz
Browse files

Pass charset to XmlPullParser.setInput instead of null 

Passing null to XmlPullParser.setInput forces it to do additional
work, which can be easily avoided if we know the charset beforehand.

bug: b/20849543

Change-Id: Iaff97be9df2d0f99d7af8f19f65934439c9658e2
parent 39087b1c

core/java/android/content/pm/RegisteredServicesCache.java

+3 −2
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import java.io.FileOutputStream; 
import java.io.IOException;

import java.io.InputStream;

import java.io.PrintWriter;

import java.nio.charset.StandardCharsets;

import java.util.ArrayList;

import java.util.Collection;

import java.util.Collections;
@@ -573,7 +574,7 @@ public abstract class RegisteredServicesCache<V> { 
    private void readPersistentServicesLocked(InputStream is)

            throws XmlPullParserException, IOException {

        XmlPullParser parser = Xml.newPullParser();

        parser.setInput(is, null);

        parser.setInput(is, StandardCharsets.UTF_8.name());

        int eventType = parser.getEventType();

        while (eventType != XmlPullParser.START_TAG

                && eventType != XmlPullParser.END_DOCUMENT) {
@@ -663,7 +664,7 @@ public abstract class RegisteredServicesCache<V> { 
        try {

            fos = atomicFile.startWrite();

            XmlSerializer out = new FastXmlSerializer();

            out.setOutput(fos, "utf-8");

            out.setOutput(fos, StandardCharsets.UTF_8.name());

            out.startDocument(null, true);

            out.setFeature("http://xmlpull.org/v1/doc/features.html#indent-output", true);

            out.startTag(null, "services");

core/java/android/widget/ActivityChooserModel.java

+3 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import java.io.FileNotFoundException; 
import java.io.FileOutputStream;

import java.io.IOException;

import java.math.BigDecimal;

import java.nio.charset.StandardCharsets;

import java.util.ArrayList;

import java.util.Collections;

import java.util.HashMap;
@@ -991,7 +992,7 @@ public class ActivityChooserModel extends DataSetObservable { 
        }

        try {

            XmlPullParser parser = Xml.newPullParser();

            parser.setInput(fis, null);

            parser.setInput(fis, StandardCharsets.UTF_8.name());



            int type = XmlPullParser.START_DOCUMENT;

            while (type != XmlPullParser.END_DOCUMENT && type != XmlPullParser.START_TAG) {
@@ -1074,7 +1075,7 @@ public class ActivityChooserModel extends DataSetObservable { 


            try {

                serializer.setOutput(fos, null);

                serializer.startDocument("UTF-8", true);

                serializer.startDocument(StandardCharsets.UTF_8.name(), true);

                serializer.startTag(null, TAG_HISTORICAL_RECORDS);



                final int recordCount = historicalRecords.size();

core/java/com/android/internal/os/BatteryStatsImpl.java

+3 −2
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ import java.io.FileNotFoundException; 
import java.io.FileOutputStream;

import java.io.IOException;

import java.io.PrintWriter;

import java.nio.charset.StandardCharsets;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.HashMap;
@@ -6814,7 +6815,7 @@ public final class BatteryStatsImpl extends BatteryStats { 
            final ByteArrayOutputStream memStream = new ByteArrayOutputStream();

            try {

                XmlSerializer out = new FastXmlSerializer();

                out.setOutput(memStream, "utf-8");

                out.setOutput(memStream, StandardCharsets.UTF_8.name());

                writeDailyItemsLocked(out);

                BackgroundThread.getHandler().post(new Runnable() {

                    @Override
@@ -6900,7 +6901,7 @@ public final class BatteryStatsImpl extends BatteryStats { 
        }

        try {

            XmlPullParser parser = Xml.newPullParser();

            parser.setInput(stream, null);

            parser.setInput(stream, StandardCharsets.UTF_8.name());

            readDailyItemsLocked(parser);

        } catch (XmlPullParserException e) {

        } finally {

core/java/com/android/internal/util/XmlUtils.java

+5 −4
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import java.io.IOException; 
import java.io.InputStream;

import java.io.OutputStream;

import java.net.ProtocolException;

import java.nio.charset.StandardCharsets;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.HashSet;
@@ -182,7 +183,7 @@ public class XmlUtils { 
    public static final void writeMapXml(Map val, OutputStream out)

            throws XmlPullParserException, java.io.IOException {

        XmlSerializer serializer = new FastXmlSerializer();

        serializer.setOutput(out, "utf-8");

        serializer.setOutput(out, StandardCharsets.UTF_8.name());

        serializer.startDocument(null, true);

        serializer.setFeature("http://xmlpull.org/v1/doc/features.html#indent-output", true);

        writeMapXml(val, null, serializer);
@@ -205,7 +206,7 @@ public class XmlUtils { 
    throws XmlPullParserException, java.io.IOException

    {

        XmlSerializer serializer = Xml.newSerializer();

        serializer.setOutput(out, "utf-8");

        serializer.setOutput(out, StandardCharsets.UTF_8.name());

        serializer.startDocument(null, true);

        serializer.setFeature("http://xmlpull.org/v1/doc/features.html#indent-output", true);

        writeListXml(val, null, serializer);
@@ -732,7 +733,7 @@ public class XmlUtils { 
    throws XmlPullParserException, java.io.IOException

    {

        XmlPullParser   parser = Xml.newPullParser();

        parser.setInput(in, null);

        parser.setInput(in, StandardCharsets.UTF_8.name());

        return (HashMap<String, ?>) readValueXml(parser, new String[1]);

    }
@@ -753,7 +754,7 @@ public class XmlUtils { 
    throws XmlPullParserException, java.io.IOException

    {

        XmlPullParser   parser = Xml.newPullParser();

        parser.setInput(in, null);

        parser.setInput(in, StandardCharsets.UTF_8.name());

        return (ArrayList)readValueXml(parser, new String[1]);

    }

packages/PrintSpooler/src/com/android/printspooler/model/PrintSpoolerService.java

+3 −2
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import java.io.FileNotFoundException; 
import java.io.FileOutputStream;

import java.io.IOException;

import java.io.PrintWriter;

import java.nio.charset.StandardCharsets;

import java.util.ArrayList;

import java.util.List;
@@ -757,7 +758,7 @@ public final class PrintSpoolerService extends Service { 
                out = mStatePersistFile.startWrite();



                XmlSerializer serializer = new FastXmlSerializer();

                serializer.setOutput(out, "utf-8");

                serializer.setOutput(out, StandardCharsets.UTF_8.name());

                serializer.startDocument(null, true);

                serializer.startTag(null, TAG_SPOOLER);
@@ -952,7 +953,7 @@ public final class PrintSpoolerService extends Service { 
            }

            try {

                XmlPullParser parser = Xml.newPullParser();

                parser.setInput(in, null);

                parser.setInput(in, StandardCharsets.UTF_8.name());

                parseState(parser);

            } catch (IllegalStateException ise) {

                Slog.w(LOG_TAG, "Failed parsing ", ise);