summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanesh M <daneshm90@gmail.com>2013-09-13 16:50:24 -0700
committerDanesh M <daneshm90@gmail.com>2013-09-13 16:53:36 -0700
commitffbe656a576ff90afb330441023df1c2379f12d3 (patch)
tree924b26774ff4ddd3f58b8bb9f447f4447d13626c
parent33574c2eb20096d308bff21c1b3ec6c0f25a0e46 (diff)
downloadandroid_packages_apps_Trebuchet-ffbe656a576ff90afb330441023df1c2379f12d3.tar.gz
android_packages_apps_Trebuchet-ffbe656a576ff90afb330441023df1c2379f12d3.tar.bz2
android_packages_apps_Trebuchet-ffbe656a576ff90afb330441023df1c2379f12d3.zip
Trebuchet : Fix asset xml parsing
openXmlResourceParser only seems to work for compiled resources. This addresses the issue introduced in http://review.cyanogenmod.org/#/c/49629/6 where icon packs which relied on appfilter.xml to provide icons broke. Change-Id: Ia1c92258638faa8ebc7523762e37ae532aba7d72
-rw-r--r--src/com/cyanogenmod/trebuchet/IconPackHelper.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/cyanogenmod/trebuchet/IconPackHelper.java b/src/com/cyanogenmod/trebuchet/IconPackHelper.java
index ed44c250e..cb60a52bc 100644
--- a/src/com/cyanogenmod/trebuchet/IconPackHelper.java
+++ b/src/com/cyanogenmod/trebuchet/IconPackHelper.java
@@ -191,7 +191,10 @@ public class IconPackHelper {
Map<ComponentName, String> iconPackResources = new HashMap<ComponentName, String>();
try {
- parser = res.getAssets().openXmlResourceParser("appfilter.xml");
+ inputStream = res.getAssets().open("appfilter.xml");
+ XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
+ parser = factory.newPullParser();
+ parser.setInput(inputStream, "UTF-8");
} catch (Exception e) {
// Catch any exception since we want to fall back to parsing the xml/
// resource in all cases