From 87648756e3d6746ae1e42b471f7d10d06507d0fa Mon Sep 17 00:00:00 2001
From: Mahaver Chopra <mahaver@google.com>
Date: Fri, 8 Jan 2016 19:23:57 +0000
Subject: [PATCH] Handle null pointer exception

Handle null pointer exception, just in case calling entitity doesn't
check.

Change-Id: I1b4809476cc689ad3dfd426e123a64e9a0336c87
---
 .../src/com/android/providers/settings/SettingsProvider.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 1896bbbe0a21a..57d495f6f9361 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 @@ 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;