summaryrefslogtreecommitdiffstats
path: root/core/java/android/util
diff options
context:
space:
mode:
authorTom O'Neill <tomo@google.com>2010-11-08 08:02:43 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-11-08 08:02:44 -0800
commit0f2d6c69f315365a81c4e07065401aab69ed9282 (patch)
treef2a31c41c71a76e56e865574c069c5210b313bc8 /core/java/android/util
parent7f7bd525680ec5f3c0437993b8016f7cad70f29e (diff)
parent28e3f101707c7a03dcc774b9b0e6d95d68b3752d (diff)
downloadframeworks_base-0f2d6c69f315365a81c4e07065401aab69ed9282.zip
frameworks_base-0f2d6c69f315365a81c4e07065401aab69ed9282.tar.gz
frameworks_base-0f2d6c69f315365a81c4e07065401aab69ed9282.tar.bz2
Merge "Remove inappropriate conversion of IOException to AssertionError"
Diffstat (limited to 'core/java/android/util')
-rw-r--r--core/java/android/util/Xml.java14
1 files changed, 5 insertions, 9 deletions
diff --git a/core/java/android/util/Xml.java b/core/java/android/util/Xml.java
index a2b69a5..873a218 100644
--- a/core/java/android/util/Xml.java
+++ b/core/java/android/util/Xml.java
@@ -79,15 +79,11 @@ public class Xml {
*/
public static void parse(InputStream in, Encoding encoding,
ContentHandler contentHandler) throws IOException, SAXException {
- try {
- XMLReader reader = new ExpatReader();
- reader.setContentHandler(contentHandler);
- InputSource source = new InputSource(in);
- source.setEncoding(encoding.expatName);
- reader.parse(source);
- } catch (IOException e) {
- throw new AssertionError(e);
- }
+ XMLReader reader = new ExpatReader();
+ reader.setContentHandler(contentHandler);
+ InputSource source = new InputSource(in);
+ source.setEncoding(encoding.expatName);
+ reader.parse(source);
}
/**