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

Commit c134ef08 authored by Bonian Chen's avatar Bonian Chen
Browse files

[Settings] Replace ImsManager#isWfcEnabledByPlatform() 

Replace ImsManager#isWfcEnabledByPlatform().

Bug:  140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSettingsTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingPreferenceControllerTest

Change-Id: I85907efb39aecdb3fb18cacf11ce4510b898edc4
parent ddd8a8fa

src/com/android/settings/network/ims/WifiCallingQueryImsState.java

+20 −8
Original line number Diff line number Diff line
@@ -20,8 +20,10 @@ import android.content.Context; 
import android.telecom.TelecomManager;

import android.telephony.AccessNetworkConstants;

import android.telephony.SubscriptionManager;

import android.telephony.ims.ImsException;

import android.telephony.ims.feature.MmTelFeature;

import android.telephony.ims.stub.ImsRegistrationImplBase;

import android.util.Log;



import androidx.annotation.VisibleForTesting;
@@ -34,6 +36,8 @@ import com.android.settings.network.telephony.MobileNetworkUtils; 
 */

public class WifiCallingQueryImsState extends ImsQueryController  {



    private static final String LOG_TAG = "WifiCallingQueryImsState";



    private Context mContext;

    private int mSubId;
@@ -69,21 +73,29 @@ public class WifiCallingQueryImsState extends ImsQueryController { 
    }



    /**

     * Check whether Wifi Calling has been provisioned or not on this subscription

     * Check whether Wifi Calling is a supported feature on this subscription

     *

     * @return true when Wifi Calling has been enabled, otherwise false

     * @return true when Wifi Calling is a supported feature, otherwise false

     */

    public boolean isWifiCallingProvisioned() {

    public boolean isWifiCallingSupported() {

        if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {

            return false;

        }

        final ImsManager imsManager = getImsManager(mSubId);

        if (imsManager == null) {

        try {

            return isEnabledByPlatform(mSubId);

        } catch (InterruptedException | IllegalArgumentException | ImsException exception) {

            Log.w(LOG_TAG, "fail to get WFC supporting status. subId=" + mSubId, exception);

        }

        return false;

    }



        return imsManager.isWfcEnabledByPlatform()

                && isProvisionedOnDevice(mSubId);

    /**

     * Check whether Wifi Calling has been provisioned or not on this subscription

     *

     * @return true when Wifi Calling has been enabled, otherwise false

     */

    public boolean isWifiCallingProvisioned() {

        return isWifiCallingSupported() && isProvisionedOnDevice(mSubId);

    }



    /**

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

+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment 


        updateBody();



        if (mImsManager.isWfcEnabledByPlatform()) {

        if (queryImsState(mSubId).isWifiCallingSupported()) {

            mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);



            mSwitchBar.addOnSwitchChangeListener(this);

tests/robotests/src/com/android/settings/network/ims/MockWifiCallingQueryImsState.java

+16 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.network.ims;



import android.content.Context;

import android.telephony.ims.ImsException;



import com.android.ims.ImsManager;
@@ -27,6 +28,7 @@ import com.android.ims.ImsManager; 
public class MockWifiCallingQueryImsState extends WifiCallingQueryImsState {



    private Boolean mIsTtyOnVolteEnabled;

    private Boolean mIsEnabledOnPlatform;

    private Boolean mIsProvisionedOnDevice;

    private Boolean mIsEnabledByUser;
@@ -56,6 +58,20 @@ public class MockWifiCallingQueryImsState extends WifiCallingQueryImsState { 
        return super.isTtyOnVolteEnabled(subId);

    }





    public void setIsEnabledByPlatform(boolean isEnabled) {

        mIsEnabledOnPlatform = isEnabled;

    }



    @Override

    boolean isEnabledByPlatform(int subId) throws InterruptedException, ImsException,

            IllegalArgumentException {

        if (mIsEnabledOnPlatform != null) {

            return mIsEnabledOnPlatform;

        }

        return super.isEnabledByPlatform(subId);

    }



    public void setIsProvisionedOnDevice(boolean isProvisioned) {

        mIsProvisionedOnDevice = isProvisioned;

    }

tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsTest.java

+3 −2
Original line number Diff line number Diff line
@@ -78,7 +78,8 @@ public class WifiCallingSettingsTest { 
        doReturn(true).when(mQueryImsState2).isEnabledByUser();

        doReturn(mImsManager).when(mQueryImsState1).getImsManager(anyInt());

        doReturn(mImsManager).when(mQueryImsState2).getImsManager(anyInt());

        doReturn(true).when(mImsManager).isWfcEnabledByPlatform();

        mQueryImsState1.setIsEnabledByPlatform(true);

        mQueryImsState2.setIsEnabledByPlatform(true);

        mQueryImsState1.setIsProvisionedOnDevice(true);

        mQueryImsState2.setIsProvisionedOnDevice(true);
@@ -100,7 +101,7 @@ public class WifiCallingSettingsTest { 


        SubscriptionUtil.setActiveSubscriptionsForTesting(new ArrayList<>(

                Collections.singletonList(info)));

        doReturn(true).when(mImsManager).isWfcEnabledByPlatform();

        mQueryImsState1.setIsEnabledByPlatform(true);

        mQueryImsState1.setIsProvisionedOnDevice(true);



        final Intent intent = new Intent();