PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Fix test failure of WFC group" into sc-dev am: 38b22563f8

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

Change-Id: I7f407bf133d33034cf936319e989043c9086490a
This commit is contained in:
Zoey Chen
2021-06-09 11:56:43 +00:00
committed by Automerger Merge Worker
parent bf203b18e5 38b22563f8
commit 5047a5d041
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java
View File

@@ -47,6 +47,7 @@ import com.android.settings.network.ims.WifiCallingQueryImsState;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -86,7 +87,8 @@ public class NetworkProviderWifiCallingGroup extends
} }
private void setSubscriptionInfoList(Context context) { private void setSubscriptionInfoList(Context context) {
mSubInfoListForWfc = SubscriptionUtil.getActiveSubscriptions(mSubscriptionManager); mSubInfoListForWfc = new ArrayList<>(
SubscriptionUtil.getActiveSubscriptions(mSubscriptionManager));
if (mSubInfoListForWfc != null) { if (mSubInfoListForWfc != null) {
mSubInfoListForWfc.removeIf(info -> { mSubInfoListForWfc.removeIf(info -> {
final int subId = info.getSubscriptionId(); final int subId = info.getSubscriptionId();