| commit | d68cc200ec2f420df0c9c0e67628e7bf2e47e2d6 | [log] [tgz] |
|---|---|---|
| author | Mahaver Chopra <mahaver@google.com> | Fri Jan 08 20:20:02 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jan 08 20:20:02 2016 +0000 |
| tree | 474bd26ac8c9221fc587cca91986d74846eb0d47 | |
| parent | f8565afc8ae823fd65978e95da9f9652495bdc53 [diff] | |
| parent | 87648756e3d6746ae1e42b471f7d10d06507d0fa [diff] |
Merge "Handle null pointer exception"
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 1896bbb..57d495f 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -1010,7 +1010,7 @@ 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;