PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Change API for backup calling supporting status" into sc-dev

Browse Source
This commit is contained in:
Bonian Chen
2021-06-11 14:18:17 +00:00
committed by Android (Google) Code Review
parent efd1c870f2 6546d68217
commit f39b86b5db
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/settings/network/telephony/BackupCallingPreferenceController.java
View File

@@ -31,6 +31,7 @@ import androidx.preference.SwitchPreference;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.network.SubscriptionUtil; import com.android.settings.network.SubscriptionUtil;
import com.android.settings.network.ims.WifiCallingQueryImsState;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@@ -147,16 +148,20 @@ public class BackupCallingPreferenceController extends TelephonyTogglePreference
} }
private boolean hasBackupCallingFeature(int subscriptionId) { private boolean hasBackupCallingFeature(int subscriptionId) {
PersistableBundle carrierConfig = getCarrierConfigForSubId(subscriptionId); return isCrossSimEnabledByPlatform(mContext, subscriptionId);
Boolean featureEnableStatus = null; }
if (carrierConfig != null) {
featureEnableStatus = carrierConfig.getBoolean( protected boolean isCrossSimEnabledByPlatform(Context context, int subscriptionId) {
CarrierConfigManager.KEY_CARRIER_CROSS_SIM_IMS_AVAILABLE_BOOL, false); // 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, "Not supported by framework. subId = " + subscriptionId);
Log.d(LOG_TAG, "config " + CarrierConfigManager.KEY_CARRIER_CROSS_SIM_IMS_AVAILABLE_BOOL return false;
+ "=" + featureEnableStatus + " for subId=" + subscriptionId);
return (featureEnableStatus != null) && featureEnableStatus.booleanValue();
} }
private ImsMmTelManager getImsMmTelManager(int subId) { private ImsMmTelManager getImsMmTelManager(int subId) {