Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6bf9262 authored by Zoey Chen's avatar Zoey Chen Committed by Automerger Merge Worker
Browse files

[Settings] get wrong toggle when handle the WFC changed am: aee115ee 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20806352



Change-Id: Icf924f45689bfa0906661be1bfee032520cafab8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3279e1a2 aee115ee

src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java

+6 −4
Original line number Diff line number Diff line
@@ -376,15 +376,17 @@ public class WifiCallingSliceHelper { 
            final WifiCallingQueryImsState queryState = queryImsState(subId);

            if (queryState.isWifiCallingProvisioned()) {

                final boolean currentValue = isWifiCallingEnabled();

                final boolean newValue = intent.getBooleanExtra(EXTRA_TOGGLE_STATE,

                        currentValue);

                final boolean newValue = !(intent.getBooleanExtra(EXTRA_TOGGLE_STATE,

                        currentValue));

                final Intent activationAppIntent =

                        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

                    // or there is no activation involved - Update the setting

                    final ImsMmTelManager imsMmTelManager = getImsMmTelManager(subId);

                    imsMmTelManager.setVoWiFiSettingEnabled(!newValue);

                    imsMmTelManager.setVoWiFiSettingEnabled(newValue);

                } else {

                    Log.w(TAG, "action not taken: subId " + subId

                            + " from " + currentValue + " to " + newValue);