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

Commit 2d3c8e3c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Settings] Remove WFC enabled state condition of querying Telecomm."... 

Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81 am: 1765b7d8

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



Change-Id: I46c9e01f6edfcf325cbbbc10d58735394d99660e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 465a31a6 1765b7d8

src/com/android/settings/network/telephony/MobileNetworkUtils.java

+4 −21
Original line number Diff line number Diff line
@@ -940,28 +940,11 @@ public class MobileNetworkUtils { 
     * Copied from WifiCallingPreferenceController#isWifiCallingEnabled()

     */

    public static boolean isWifiCallingEnabled(Context context, int subId,

            @Nullable WifiCallingQueryImsState queryImsState,

            @Nullable PhoneAccountHandle phoneAccountHandle) {

        if (phoneAccountHandle == null){

            phoneAccountHandle = context.getSystemService(TelecomManager.class)

                    .getSimCallManagerForSubscription(subId);

        }

        boolean isWifiCallingEnabled;

        if (phoneAccountHandle != null) {

            final Intent intent = buildPhoneAccountConfigureIntent(context, phoneAccountHandle);

            if (intent == null) {

                Log.d(TAG, "Can not get phoneAccount configure intent.");

                isWifiCallingEnabled = false;

            } else {

                isWifiCallingEnabled = true;

            }

        } else {

            @Nullable WifiCallingQueryImsState queryImsState) {

        if (queryImsState == null) {

            queryImsState = new WifiCallingQueryImsState(context, subId);

        }

            isWifiCallingEnabled = queryImsState.isReadyToWifiCalling();

        }

        return isWifiCallingEnabled;

        return queryImsState.isReadyToWifiCalling();

    }



    /**

src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java

+1 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.content.Context; 
import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.os.PersistableBundle;

import android.provider.Settings;

import android.telecom.PhoneAccountHandle;

import android.telecom.TelecomManager;
@@ -314,8 +313,7 @@ public class NetworkProviderWifiCallingGroup extends 
    @VisibleForTesting

    protected boolean shouldShowWifiCallingForSub(int subId) {

        if (SubscriptionManager.isValidSubscriptionId(subId)

                && MobileNetworkUtils.isWifiCallingEnabled(mContext, subId, queryImsState(subId),

                null)) {

                && MobileNetworkUtils.isWifiCallingEnabled(mContext, subId, queryImsState(subId))) {

            return true;

        }

        return false;

src/com/android/settings/network/telephony/WifiCallingPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public class WifiCallingPreferenceController extends TelephonyBasePreferenceCont 
    @Override

    public int getAvailabilityStatus(int subId) {

        return SubscriptionManager.isValidSubscriptionId(subId)

                && MobileNetworkUtils.isWifiCallingEnabled(mContext, subId, null, null)

                && MobileNetworkUtils.isWifiCallingEnabled(mContext, subId, null)

                ? AVAILABLE

                : UNSUPPORTED_ON_DEVICE;

    }

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

+4 −2
Original line number Diff line number Diff line
@@ -257,8 +257,10 @@ public class WifiCallingSettings extends SettingsPreferenceFragment 
        for (SubscriptionInfo subInfo : subInfoList) {

            int subId = subInfo.getSubscriptionId();

            try {

                if (MobileNetworkUtils.isWifiCallingEnabled(getContext(), subId,

                        queryImsState(subId), null)) {

                if (MobileNetworkUtils.isWifiCallingEnabled(

                        getContext(),

                        subId,

                        queryImsState(subId))) {

                    selectedList.add(subInfo);

                }

            } catch (Exception exception) {}

tests/unit/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java

+4 −20
Original line number Diff line number Diff line
@@ -385,35 +385,19 @@ public class MobileNetworkUtilsTest { 
    }



    @Test

    public void isWifiCallingEnabled_hasPhoneAccountHandleAndHasActivityHandleIntent_returnTrue() {

        buildPhoneAccountConfigureIntent(true);



        assertTrue(MobileNetworkUtils.isWifiCallingEnabled(mContext, SUB_ID_1,

                null, mPhoneAccountHandle));

    }



    @Test

    public void isWifiCallingEnabled_hasPhoneAccountHandleAndNoActivityHandleIntent_returnFalse() {

        buildPhoneAccountConfigureIntent(false);



        assertFalse(MobileNetworkUtils.isWifiCallingEnabled(mContext, SUB_ID_1,

                null, mPhoneAccountHandle));

    }



    @Test

    public void isWifiCallingEnabled_noPhoneAccountHandleAndWifiCallingIsReady_returnTrue() {

    public void isWifiCallingEnabled_wifiCallingIsReady_returnTrue() {

        setWifiCallingEnabled(true);



        assertTrue(MobileNetworkUtils.isWifiCallingEnabled(mContext, SUB_ID_1,

                mMockQueryWfcState, null));

                mMockQueryWfcState));

    }



    @Test

    public void isWifiCallingEnabled_noPhoneAccountHandleAndWifiCallingNotReady_returnFalse() {

    public void isWifiCallingEnabled_wifiCallingNotReady_returnFalse() {

        setWifiCallingEnabled(false);



        assertFalse(MobileNetworkUtils.isWifiCallingEnabled(mContext, SUB_ID_1,

                mMockQueryWfcState, null));

                mMockQueryWfcState));

    }



    private void setWifiCallingEnabled(boolean enabled){