diff options
author | Wojciech Staszkiewicz <staszkiewicz@google.com> | 2015-05-08 14:58:46 +0100 |
---|---|---|
committer | Wojciech Staszkiewicz <staszkiewicz@google.com> | 2015-05-14 10:24:34 +0100 |
commit | 9e9e2e73c6ec7bece20268196dc89ad0c8bafad4 (patch) | |
tree | c2bf1f99d8bc64db925a95dcab0b5ddec6b8de41 /services/core/java/com/android/server/AppOpsService.java | |
parent | 39087b1cec6a54e96ab9eafe8317952720790533 (diff) | |
download | frameworks_base-9e9e2e73c6ec7bece20268196dc89ad0c8bafad4.zip frameworks_base-9e9e2e73c6ec7bece20268196dc89ad0c8bafad4.tar.gz frameworks_base-9e9e2e73c6ec7bece20268196dc89ad0c8bafad4.tar.bz2 |
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
Diffstat (limited to 'services/core/java/com/android/server/AppOpsService.java')
-rw-r--r-- | services/core/java/com/android/server/AppOpsService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/AppOpsService.java b/services/core/java/com/android/server/AppOpsService.java index 1366149..7d427d6 100644 --- a/services/core/java/com/android/server/AppOpsService.java +++ b/services/core/java/com/android/server/AppOpsService.java @@ -23,6 +23,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.HashMap; import java.util.Iterator; @@ -915,7 +916,7 @@ public class AppOpsService extends IAppOpsService.Stub { boolean success = false; try { XmlPullParser parser = Xml.newPullParser(); - parser.setInput(stream, null); + parser.setInput(stream, StandardCharsets.UTF_8.name()); int type; while ((type = parser.next()) != XmlPullParser.START_TAG && type != XmlPullParser.END_DOCUMENT) { @@ -1075,7 +1076,7 @@ public class AppOpsService extends IAppOpsService.Stub { try { XmlSerializer out = new FastXmlSerializer(); - out.setOutput(stream, "utf-8"); + out.setOutput(stream, StandardCharsets.UTF_8.name()); out.startDocument(null, true); out.startTag(null, "app-ops"); |