[Settings] Remove isWfcProvisionedOnDevice API
Replace isWfcProvisionedOnDevice() by IMS's ProvisioningManager. Bug: 140542283 Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSettingsTest make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSettingsForSubTest make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSliceHelperTest make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkUtilsTest Change-Id: Idb063bdab3d3b11c348804c1c0ecb268cca3068e
This commit is contained in:
@@ -22,6 +22,9 @@ import android.os.Bundle;
|
||||
import android.provider.Settings;
|
||||
import android.telephony.SubscriptionInfo;
|
||||
import android.telephony.SubscriptionManager;
|
||||
import android.telephony.ims.ProvisioningManager;
|
||||
import android.telephony.ims.feature.MmTelFeature;
|
||||
import android.telephony.ims.stub.ImsRegistrationImplBase;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
@@ -100,11 +103,11 @@ public class WifiCallingSettings extends InstrumentedFragment implements HelpRes
|
||||
if (mSil == null) {
|
||||
return;
|
||||
}
|
||||
Intent intent = getActivity().getIntent();
|
||||
final Intent intent = getActivity().getIntent();
|
||||
if (intent == null) {
|
||||
return;
|
||||
}
|
||||
int subId = intent.getIntExtra(Settings.EXTRA_SUB_ID,
|
||||
final int subId = intent.getIntExtra(Settings.EXTRA_SUB_ID,
|
||||
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
|
||||
if (SubscriptionManager.isValidSubscriptionId(subId)) {
|
||||
for (SubscriptionInfo subInfo : mSil) {
|
||||
@@ -168,7 +171,7 @@ public class WifiCallingSettings extends InstrumentedFragment implements HelpRes
|
||||
args.putBoolean(SearchMenuController.NEED_SEARCH_ICON_IN_ACTION_BAR, false);
|
||||
args.putInt(WifiCallingSettingsForSub.FRAGMENT_BUNDLE_SUBID,
|
||||
mSil.get(position).getSubscriptionId());
|
||||
WifiCallingSettingsForSub fragment = new WifiCallingSettingsForSub();
|
||||
final WifiCallingSettingsForSub fragment = new WifiCallingSettingsForSub();
|
||||
fragment.setArguments(args);
|
||||
|
||||
return fragment;
|
||||
@@ -195,14 +198,21 @@ public class WifiCallingSettings extends InstrumentedFragment implements HelpRes
|
||||
|
||||
@VisibleForTesting
|
||||
boolean isWfcEnabledByPlatform(SubscriptionInfo info) {
|
||||
ImsManager imsManager = ImsManager.getInstance(getActivity(), info.getSimSlotIndex());
|
||||
final ImsManager imsManager = ImsManager.getInstance(getActivity(),
|
||||
info.getSimSlotIndex());
|
||||
return imsManager.isWfcEnabledByPlatform();
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
boolean isWfcProvisionedOnDevice(SubscriptionInfo info) {
|
||||
ImsManager imsManager = ImsManager.getInstance(getActivity(), info.getSimSlotIndex());
|
||||
return imsManager.isWfcProvisionedOnDevice();
|
||||
final ProvisioningManager provisioningMgr =
|
||||
ProvisioningManager.createForSubscriptionId(info.getSubscriptionId());
|
||||
if (provisioningMgr == null) {
|
||||
return true;
|
||||
}
|
||||
return provisioningMgr.getProvisioningStatusForCapability(
|
||||
MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE,
|
||||
ImsRegistrationImplBase.REGISTRATION_TECH_IWLAN);
|
||||
}
|
||||
|
||||
private void updateSubList() {
|
||||
|
@@ -55,6 +55,7 @@ import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.SettingsPreferenceFragment;
|
||||
import com.android.settings.Utils;
|
||||
import com.android.settings.core.SubSettingLauncher;
|
||||
import com.android.settings.network.telephony.MobileNetworkUtils;
|
||||
import com.android.settings.widget.SwitchBar;
|
||||
|
||||
/**
|
||||
@@ -307,8 +308,13 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
|
||||
return view;
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
boolean isWfcProvisionedOnDevice() {
|
||||
return MobileNetworkUtils.isWfcProvisionedOnDevice(mSubId);
|
||||
}
|
||||
|
||||
private void updateBody() {
|
||||
if (!mImsManager.isWfcProvisionedOnDevice()) {
|
||||
if (!isWfcProvisionedOnDevice()) {
|
||||
// This screen is not allowed to be shown due to provisioning policy and should
|
||||
// therefore be closed.
|
||||
finish();
|
||||
|
@@ -45,6 +45,7 @@ import com.android.ims.ImsConfig;
|
||||
import com.android.ims.ImsManager;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.Utils;
|
||||
import com.android.settings.network.telephony.MobileNetworkUtils;
|
||||
import com.android.settings.slices.SliceBroadcastReceiver;
|
||||
|
||||
import java.util.concurrent.Callable;
|
||||
@@ -139,7 +140,7 @@ public class WifiCallingSliceHelper {
|
||||
final ImsManager imsManager = getImsManager(subId);
|
||||
|
||||
if (!imsManager.isWfcEnabledByPlatform()
|
||||
|| !imsManager.isWfcProvisionedOnDevice()) {
|
||||
|| !isWfcProvisionedOnDevice(subId)) {
|
||||
Log.d(TAG, "Wifi calling is either not provisioned or not enabled by Platform");
|
||||
return null;
|
||||
}
|
||||
@@ -237,7 +238,7 @@ public class WifiCallingSliceHelper {
|
||||
final ImsMmTelManager imsMmTelManager = getImsMmTelManager(subId);
|
||||
|
||||
if (!imsManager.isWfcEnabledByPlatform()
|
||||
|| !imsManager.isWfcProvisionedOnDevice()) {
|
||||
|| !isWfcProvisionedOnDevice(subId)) {
|
||||
Log.d(TAG, "Wifi calling is either not provisioned or not enabled by platform");
|
||||
return null;
|
||||
}
|
||||
@@ -386,7 +387,7 @@ public class WifiCallingSliceHelper {
|
||||
if (subId > SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
|
||||
final ImsManager imsManager = getImsManager(subId);
|
||||
if (imsManager.isWfcEnabledByPlatform()
|
||||
&& imsManager.isWfcProvisionedOnDevice()) {
|
||||
&& isWfcProvisionedOnDevice(subId)) {
|
||||
final boolean currentValue = imsManager.isWfcEnabledByUser()
|
||||
&& imsManager.isNonTtyOrTtyOnVolteEnabled();
|
||||
final boolean newValue = intent.getBooleanExtra(EXTRA_TOGGLE_STATE,
|
||||
@@ -429,7 +430,7 @@ public class WifiCallingSliceHelper {
|
||||
final ImsManager imsManager = getImsManager(subId);
|
||||
if (isWifiCallingPrefEditable
|
||||
&& imsManager.isWfcEnabledByPlatform()
|
||||
&& imsManager.isWfcProvisionedOnDevice()
|
||||
&& isWfcProvisionedOnDevice(subId)
|
||||
&& imsManager.isWfcEnabledByUser()
|
||||
&& imsManager.isNonTtyOrTtyOnVolteEnabled()) {
|
||||
// Change the preference only when wifi calling is enabled
|
||||
@@ -512,6 +513,11 @@ public class WifiCallingSliceHelper {
|
||||
return SubscriptionManager.getDefaultVoiceSubscriptionId();
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
boolean isWfcProvisionedOnDevice(int subId) {
|
||||
return MobileNetworkUtils.isWfcProvisionedOnDevice(subId);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns Intent of the activation app required to activate wifi calling or null if there is no
|
||||
* need for activation.
|
||||
|
@@ -17,15 +17,18 @@
|
||||
package com.android.settings.wifi.calling;
|
||||
|
||||
import android.content.Context;
|
||||
import android.telephony.SubscriptionManager;
|
||||
|
||||
import com.android.ims.ImsManager;
|
||||
import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.network.telephony.MobileNetworkUtils;
|
||||
|
||||
public class WifiCallingSuggestionActivity extends SettingsActivity {
|
||||
|
||||
public static boolean isSuggestionComplete(Context context) {
|
||||
if (!ImsManager.isWfcEnabledByPlatform(context) ||
|
||||
!ImsManager.isWfcProvisionedOnDevice(context)) {
|
||||
!MobileNetworkUtils.isWfcProvisionedOnDevice(
|
||||
SubscriptionManager.getDefaultVoiceSubscriptionId())) {
|
||||
return true;
|
||||
}
|
||||
return ImsManager.isWfcEnabledByUser(context)
|
||||
|
Reference in New Issue
Block a user