commit cac64f616feeef06e497613b8d2aa8ce5ce50509
author Svetoslav Ganov <svetoslavganov@google.com> Tue Feb 21 13:24:09 2017 -0800
committer Svetoslav Ganov <svetoslavganov@google.com> Tue Feb 21 13:28:04 2017 -0800
tree b155cca5b36ff94e157062614f47a8eb68a5c036
parent caa5a35371a6afcce248c51692371895e750fff2

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

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 85c153c..1d89440 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 @@
             return false;
         }
 
-        String oldProviders = (settingValue != null) ? settingValue.getValue() : "";
+        String oldProviders = !settingValue.isNull() ? settingValue.getValue() : "";
 
         int index = oldProviders.indexOf(value);
         int end = index + value.length();