From cac64f616feeef06e497613b8d2aa8ce5ce50509 Mon Sep 17 00:00:00 2001
From: Svetoslav Ganov <svetoslavganov@google.com>
Date: Tue, 21 Feb 2017 13:24:09 -0800
Subject: [PATCH] Handle location enabled setting null value

We have the notion of a null value object whose internal
value is null. If it happens that the setting was never
populated we get back the null object whose value is null
and the code does not expect null and crashes.

bug:35368238

Test: manual

Change-Id: I02c3771b94a45b4ee53e2141711eed134542ea0c
---
 .../src/com/android/providers/settings/SettingsProvider.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 85c153cdb1643..1d89440d0e515 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -1654,7 +1654,7 @@ public class SettingsProvider extends ContentProvider {
             return false;
         }
 
-        String oldProviders = (settingValue != null) ? settingValue.getValue() : "";
+        String oldProviders = !settingValue.isNull() ? settingValue.getValue() : "";
 
         int index = oldProviders.indexOf(value);
         int end = index + value.length();