From ff0c06f20aab1c11d64e8a145021dded86a975eb Mon Sep 17 00:00:00 2001 From: Zoey Chen Date: Wed, 9 Jun 2021 14:23:04 +0800 Subject: [PATCH] [Settings] Fix test failure of WFC group Bug: 190569916 Test: atest NetworkProviderWifiCallingGroupTest Change-Id: Ie520f3709eb0751150fdbda1f14e878ba21e22c4 --- .../network/telephony/NetworkProviderWifiCallingGroup.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java b/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java index 3423ad8e3f6..b4ab2a0c535 100644 --- a/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java +++ b/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java @@ -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();