commit 3cbe1e7102a7d74c0feab722eec1221916bb46cd
author gitbuildkicker <android-build@google.com> Thu May 11 00:07:55 2017 -0700
committer gitbuildkicker <android-build@google.com> Thu May 11 00:07:55 2017 -0700
tree d5ca288c03da2faffb04e6113eb6f91eb5a66f87
parent da35f2940b2d4f773829dbd26b2105912ee09aeb
parent 49e1252f34acace58eb637d12718ed1c271b0105

merge in oc-release history after reset to oc-dev

rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java

diff --git a/rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java b/rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java
index 862074d..40de8f7 100644
--- a/rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java
+++ b/rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java
@@ -29,6 +29,8 @@
 package com.android.service.ims;
 
 import java.lang.String;
+
+import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
 import android.telephony.TelephonyManager;
 import android.content.Context;
@@ -55,9 +57,12 @@
         CarrierConfigManager configManager = (CarrierConfigManager)
                 context.getSystemService(Context.CARRIER_CONFIG_SERVICE);
         // Don't need provision.
-        if (configManager != null && !configManager.getConfig().getBoolean(
-                CarrierConfigManager.KEY_CARRIER_VOLTE_PROVISIONED_BOOL)) {
-            return true;
+        if (configManager != null) {
+            PersistableBundle config = configManager.getConfig();
+            if (config != null && !config.getBoolean(
+                    CarrierConfigManager.KEY_CARRIER_VOLTE_PROVISIONED_BOOL)) {
+                return true;
+            }
         }
 
         boolean provisioned = defaultValue;