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

Commit 38b22563 authored by Zoey Chen's avatar Zoey Chen Committed by Android (Google) Code Review
Browse files

Merge "[Settings] Fix test failure of WFC group" into sc-dev

parents 42485315 ff0c06f2

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

+3 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import com.android.settings.network.ims.WifiCallingQueryImsState; 
import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.lifecycle.Lifecycle;



import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;

import java.util.Map;
@@ -86,7 +87,8 @@ public class NetworkProviderWifiCallingGroup extends 
    }



    private void setSubscriptionInfoList(Context context) {

        mSubInfoListForWfc = SubscriptionUtil.getActiveSubscriptions(mSubscriptionManager);

        mSubInfoListForWfc = new ArrayList<>(

                SubscriptionUtil.getActiveSubscriptions(mSubscriptionManager));

        if (mSubInfoListForWfc != null) {

            mSubInfoListForWfc.removeIf(info -> {

                final int subId = info.getSubscriptionId();