commit 934a400ddce71f873c2de2564fb51981d57128e2
author Jason Monk <jmonk@google.com> Fri Jul 01 09:55:44 2016 -0400
committer Jason Monk <jmonk@google.com> Fri Jul 01 09:55:44 2016 -0400
tree 7e90d62f152f3ddcb2c61d3f8a938d2d66033b0a
parent 7a23b48266991cebc04287652426fc66ca259bfa

Protect against null carrier config

Change-Id: Ida60ead4a85017c29cc8ad3c3e7a462a9e3c720b
Fixes: 28085042

src/com/android/settings/DeviceInfoSettings.java

diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 19c4a3f..dd8064f 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -283,7 +283,7 @@
             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);
             }
         }