Snap for 9434600 from aee115ee3b
to tm-qpr2-release
Change-Id: Ife1ec39971b5ae5afe4bc279102c13c6605e6396
This commit is contained in:
@@ -376,15 +376,17 @@ public class WifiCallingSliceHelper {
|
|||||||
final WifiCallingQueryImsState queryState = queryImsState(subId);
|
final WifiCallingQueryImsState queryState = queryImsState(subId);
|
||||||
if (queryState.isWifiCallingProvisioned()) {
|
if (queryState.isWifiCallingProvisioned()) {
|
||||||
final boolean currentValue = isWifiCallingEnabled();
|
final boolean currentValue = isWifiCallingEnabled();
|
||||||
final boolean newValue = intent.getBooleanExtra(EXTRA_TOGGLE_STATE,
|
final boolean newValue = !(intent.getBooleanExtra(EXTRA_TOGGLE_STATE,
|
||||||
currentValue);
|
currentValue));
|
||||||
final Intent activationAppIntent =
|
final Intent activationAppIntent =
|
||||||
getWifiCallingCarrierActivityIntent(subId);
|
getWifiCallingCarrierActivityIntent(subId);
|
||||||
if ((newValue == currentValue) && activationAppIntent == null) {
|
// 1. If activationApp is not null, users only can turn off WFC, or
|
||||||
|
// 2. Turn on/off directly if there is no activationApp.
|
||||||
|
if ((newValue != currentValue) && (activationAppIntent == null || !newValue)) {
|
||||||
// If either the action is to turn off wifi calling setting
|
// If either the action is to turn off wifi calling setting
|
||||||
// or there is no activation involved - Update the setting
|
// or there is no activation involved - Update the setting
|
||||||
final ImsMmTelManager imsMmTelManager = getImsMmTelManager(subId);
|
final ImsMmTelManager imsMmTelManager = getImsMmTelManager(subId);
|
||||||
imsMmTelManager.setVoWiFiSettingEnabled(!newValue);
|
imsMmTelManager.setVoWiFiSettingEnabled(newValue);
|
||||||
} else {
|
} else {
|
||||||
Log.w(TAG, "action not taken: subId " + subId
|
Log.w(TAG, "action not taken: subId " + subId
|
||||||
+ " from " + currentValue + " to " + newValue);
|
+ " from " + currentValue + " to " + newValue);
|
||||||
|
Reference in New Issue
Block a user