Merge "[Settings] Change API for backup calling supporting status" into sc-dev
diff --git a/src/com/android/settings/network/telephony/BackupCallingPreferenceController.java b/src/com/android/settings/network/telephony/BackupCallingPreferenceController.java
index d1c9f7b..4f64399 100644
--- a/src/com/android/settings/network/telephony/BackupCallingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/BackupCallingPreferenceController.java
@@ -31,6 +31,7 @@
import com.android.settings.R;
import com.android.settings.network.SubscriptionUtil;
+import com.android.settings.network.ims.WifiCallingQueryImsState;
import java.util.List;
import java.util.Objects;
@@ -147,16 +148,20 @@
}
private boolean hasBackupCallingFeature(int subscriptionId) {
- PersistableBundle carrierConfig = getCarrierConfigForSubId(subscriptionId);
- Boolean featureEnableStatus = null;
- if (carrierConfig != null) {
- featureEnableStatus = carrierConfig.getBoolean(
- CarrierConfigManager.KEY_CARRIER_CROSS_SIM_IMS_AVAILABLE_BOOL, false);
+ return isCrossSimEnabledByPlatform(mContext, subscriptionId);
+ }
+
+ protected boolean isCrossSimEnabledByPlatform(Context context, int subscriptionId) {
+ // TODO : Change into API which created for accessing
+ // com.android.ims.ImsManager#isCrossSimEnabledByPlatform()
+ if ((new WifiCallingQueryImsState(context, subscriptionId)).isWifiCallingSupported()) {
+ PersistableBundle bundle = getCarrierConfigForSubId(subscriptionId);
+ return (bundle != null) && bundle.getBoolean(
+ CarrierConfigManager.KEY_CARRIER_CROSS_SIM_IMS_AVAILABLE_BOOL,
+ false /*default*/);
}
- // TODO: remove log after fixing b/182326102
- Log.d(LOG_TAG, "config " + CarrierConfigManager.KEY_CARRIER_CROSS_SIM_IMS_AVAILABLE_BOOL
- + "=" + featureEnableStatus + " for subId=" + subscriptionId);
- return (featureEnableStatus != null) && featureEnableStatus.booleanValue();
+ Log.d(LOG_TAG, "Not supported by framework. subId = " + subscriptionId);
+ return false;
}
private ImsMmTelManager getImsMmTelManager(int subId) {