Merge "[Settings] replace isNonTtyOrTtyOnVolteEnabled() in WFC"

This commit is contained in:
Bonian Chen
2020-01-21 16:11:07 +00:00
committed by Android (Google) Code Review
8 changed files with 276 additions and 3 deletions

View File

@@ -21,17 +21,20 @@ import android.telephony.SubscriptionManager;
import com.android.ims.ImsManager;
import com.android.settings.SettingsActivity;
import com.android.settings.network.ims.WifiCallingQueryImsState;
import com.android.settings.network.telephony.MobileNetworkUtils;
public class WifiCallingSuggestionActivity extends SettingsActivity {
public static boolean isSuggestionComplete(Context context) {
final WifiCallingQueryImsState queryState =
new WifiCallingQueryImsState(context,
SubscriptionManager.getDefaultVoiceSubscriptionId());
if (!ImsManager.isWfcEnabledByPlatform(context) ||
!MobileNetworkUtils.isWfcProvisionedOnDevice(
SubscriptionManager.getDefaultVoiceSubscriptionId())) {
return true;
}
return ImsManager.isWfcEnabledByUser(context)
&& ImsManager.isNonTtyOrTtyOnVolteEnabled(context);
return queryState.isEnabledByUser() && queryState.isAllowUserControl();
}
}