From 934a400ddce71f873c2de2564fb51981d57128e2 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Fri, 1 Jul 2016 09:55:44 -0400
Subject: [PATCH] Protect against null carrier config

Change-Id: Ida60ead4a85017c29cc8ad3c3e7a462a9e3c720b
Fixes: 28085042
---
 src/com/android/settings/DeviceInfoSettings.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 19c4a3f74b9..dd8064fb45d 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -283,7 +283,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
             CarrierConfigManager configManager =
                     (CarrierConfigManager) getSystemService(Context.CARRIER_CONFIG_SERVICE);
             PersistableBundle b = configManager.getConfig();
-            if (b.getBoolean(CarrierConfigManager.KEY_CI_ACTION_ON_SYS_UPDATE_BOOL)) {
+            if (b != null && b.getBoolean(CarrierConfigManager.KEY_CI_ACTION_ON_SYS_UPDATE_BOOL)) {
                 ciActionOnSysUpdate(b);
             }
         }