| commit | 39b32a9feea6b821d6a5c92202c400aa1f252200 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri May 22 09:45:19 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri May 22 09:45:19 2015 +0000 |
| tree | 6f6eae943081353563d659d055827e45f774107f | |
| parent | 7b1656acced91f1813a984841d85f026a3512669 [diff] | |
| parent | 5ba067e5d1641cba85a53c9458fbbf9a8dba5b39 [diff] |
Merge "Pass charset to XmlPullParser.setInput instead of null"
diff --git a/v7/appcompat/src/android/support/v7/internal/widget/ActivityChooserModel.java b/v7/appcompat/src/android/support/v7/internal/widget/ActivityChooserModel.java index d97f8e7..32e6df2 100644 --- a/v7/appcompat/src/android/support/v7/internal/widget/ActivityChooserModel.java +++ b/v7/appcompat/src/android/support/v7/internal/widget/ActivityChooserModel.java
@@ -972,7 +972,7 @@ } try { XmlPullParser parser = Xml.newPullParser(); - parser.setInput(fis, null); + parser.setInput(fis, "UTF-8"); int type = XmlPullParser.START_DOCUMENT; while (type != XmlPullParser.END_DOCUMENT && type != XmlPullParser.START_TAG) {