diff options
| author | Raph Levien <raph@google.com> | 2015-03-11 14:09:26 -0700 |
|---|---|---|
| committer | Raph Levien <raph@google.com> | 2015-03-11 14:37:45 -0700 |
| commit | 174fa280d106f713e2d742281adfd8166c61e012 (patch) | |
| tree | 6bc7f00b71a5fb8bf5eb724f0c6a1d95312d6dc0 /packages/SettingsProvider | |
| parent | 4771577a342214ef4f7373a8d37d015749b00347 (diff) | |
| download | frameworks_base-174fa280d106f713e2d742281adfd8166c61e012.zip frameworks_base-174fa280d106f713e2d742281adfd8166c61e012.tar.gz frameworks_base-174fa280d106f713e2d742281adfd8166c61e012.tar.bz2 | |
Fix XML parsing crash in SettingsProvider
A previous change added more whitespace to settings_global.xml to
improve human readability, but the parser is overly picky in ignoring
whitespace. This patch makes it accept all whitespace strings.
Bug: 19696812
Change-Id: I3ebb8f6df2e25f4e6b6841da743be3f3a91e2442
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java index 3a8216d..3bf6828 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java @@ -470,7 +470,7 @@ final class SettingsState { private void skipEmptyTextTags(XmlPullParser parser) throws IOException, XmlPullParserException { while (accept(parser, XmlPullParser.TEXT, null) - && "\n".equals(parser.getText())) { + && parser.isWhitespace()) { parser.next(); } } |