| commit | e7473fae800284851f4a90ab8b43d20072bc5f58 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Feb 22 01:26:53 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Feb 22 01:26:57 2017 +0000 |
| tree | ae460546b32faed1d07afc18367ad3548871f936 | |
| parent | 8a510236056fec68969816a327c0aab61c58c80a [diff] | |
| parent | cac64f616feeef06e497613b8d2aa8ce5ce50509 [diff] |
Merge "Handle location enabled setting null value"
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();