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

Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev

Browse Source 
am: 3288037bd2

Change-Id: I5833f9ece2590b16ef3184f8d315fd092f683207
This commit is contained in:
Antony Sargent
2019-06-25 23:02:14 -07:00
committed by android-build-merger
parent 9905cc9b50 3288037bd2
commit fb52368873
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/wifi/calling/WifiCallingSettings.java
View File

@@ -199,6 +199,12 @@ public class WifiCallingSettings extends InstrumentedFragment implements HelpRes
return imsManager.isWfcEnabledByPlatform();
}
@VisibleForTesting
boolean isWfcProvisionedOnDevice(SubscriptionInfo info) {
ImsManager imsManager = ImsManager.getInstance(getActivity(), info.getSimSlotIndex());
return imsManager.isWfcProvisionedOnDevice();
}
private void updateSubList() {
mSil = SubscriptionUtil.getActiveSubscriptions(
getContext().getSystemService(SubscriptionManager.class));
@@ -208,7 +214,8 @@ public class WifiCallingSettings extends InstrumentedFragment implements HelpRes
return;
}
for (int i = 0; i < mSil.size(); ) {
if (!isWfcEnabledByPlatform(mSil.get(i))) {
final SubscriptionInfo info = mSil.get(i);
if (!isWfcEnabledByPlatform(info) || !isWfcProvisionedOnDevice(info)) {
mSil.remove(i);
} else {
i++;