| commit | 87648756e3d6746ae1e42b471f7d10d06507d0fa | [log] [tgz] |
|---|---|---|
| author | Mahaver Chopra <mahaver@google.com> | Fri Jan 08 19:23:57 2016 +0000 |
| committer | Mahaver Chopra <mahaver@google.com> | Fri Jan 08 19:23:57 2016 +0000 |
| tree | 69481f30099041606a457f9c134fd13555e9328f | |
| parent | 6e274cf6c7c399a0e52cadeacfcf1c5bb05c838f [diff] [blame] |
Handle null pointer exception Handle null pointer exception, just in case calling entitity doesn't check. Change-Id: I1b4809476cc689ad3dfd426e123a64e9a0336c87
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;