commit 77f9352e5f49e988aab680af7c885fa2001fb909
author Jordan Liu <jminjie@google.com> Thu May 11 23:20:58 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 11 23:20:58 2017 +0000
tree e540c1fe2cbf8cd6ddb3e3bafbc3dfeda7e65509
parent 441da193616d017076770a457ea1bbcc8a85140a
parent e8d1f2478574b558383091573a85276c4f2b8ca9

Update reference to carrier_volte_provisioned am: ad8ea75a6c
am: e8d1f24785

Change-Id: I22866934d2cb8756f0009fc44c66afc6af590a40

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 eb415cf..862074d 100644
--- a/rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java
+++ b/rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java
@@ -29,6 +29,7 @@
 package com.android.service.ims;
 
 import java.lang.String;
+import android.telephony.CarrierConfigManager;
 import android.telephony.TelephonyManager;
 import android.content.Context;
 import com.android.ims.ImsConfig;
@@ -51,9 +52,11 @@
 
     public static boolean isFeatureProvisioned(Context context,
             int featureId, boolean defaultValue) {
+        CarrierConfigManager configManager = (CarrierConfigManager)
+                context.getSystemService(Context.CARRIER_CONFIG_SERVICE);
         // Don't need provision.
-        if (!context.getResources().getBoolean(
-                com.android.internal.R.bool.config_carrier_volte_provisioned)) {
+        if (configManager != null && !configManager.getConfig().getBoolean(
+                CarrierConfigManager.KEY_CARRIER_VOLTE_PROVISIONED_BOOL)) {
             return true;
         }