From 9e9e2e73c6ec7bece20268196dc89ad0c8bafad4 Mon Sep 17 00:00:00 2001 From: Wojciech Staszkiewicz Date: Fri, 8 May 2015 14:58:46 +0100 Subject: 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 --- core/java/android/widget/ActivityChooserModel.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'core/java/android/widget/ActivityChooserModel.java') diff --git a/core/java/android/widget/ActivityChooserModel.java b/core/java/android/widget/ActivityChooserModel.java index 51174c3..75c857c 100644 --- a/core/java/android/widget/ActivityChooserModel.java +++ b/core/java/android/widget/ActivityChooserModel.java @@ -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(); -- cgit v1.1