From 174fa280d106f713e2d742281adfd8166c61e012 Mon Sep 17 00:00:00 2001
From: Raph Levien <raph@google.com>
Date: Wed, 11 Mar 2015 14:09:26 -0700
Subject: 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
---
 .../src/com/android/providers/settings/SettingsState.java               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/SettingsProvider')

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();
         }
     }
-- 
cgit v1.1