Merge "Handle null pointer exception"

2016-01-08 20:20:02 +00:00
parent f8565afc8a 87648756e3
commit d68cc200ec
1 changed files with 1 additions and 1 deletions
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -1010,7 +1010,7 @@ public class SettingsProvider extends ContentProvider {
                break;

            default:
-                if (setting.startsWith(Settings.Global.DATA_ROAMING)) {
+                if (setting != null && setting.startsWith(Settings.Global.DATA_ROAMING)) {
                    if ("0".equals(value)) return false;
                    restriction = UserManager.DISALLOW_DATA_ROAMING;
                    break;