APN Settings: on MVNOs, filter unmatching MMS APNslp5.1

If you have an MVNO, you only show the APNs for it.
However, the filtering doesn't happen to MMS APNs, so you end up listing all
the MMS APNs for that mcc/mnc pair anyway.

With this patch we now also filter out MMS APNs.

Change-Id: I61742cffa2c5e000782eec5282d2c76357807871
Issue-Id: CYNGNOS-1462

1 files changed, 7 insertions, 1 deletions

diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 275434557fe..352b8fe1cab 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -313,7 +313,11 @@ public class ApnSettings extends SettingsPreferenceFragment implements
 
                 if (isMvno) {
                     if (!mvnoMatches(mvnoType, mvnoData, simOperatorName, imsiSIM, gid1)) {
-                        apnList.removePreference(pref);
+                        if (pref.getSelectable()) {
+                            apnList.removePreference(pref);
+                        } else {
+                            mmsApnList.remove(pref);
+                        }
                     } else {
                         ApnInfo apnInfo = new ApnInfo(name, apn, key, type, mvnoType, readOnly);
                         if ("spn".equals(mvnoType)) {
@@ -334,10 +338,12 @@ public class ApnSettings extends SettingsPreferenceFragment implements
                 if (mvnoImsiList.size() > 0) {
                     for (Preference pref : mvnoGid1List) {
                         apnList.removePreference(pref);
+                        mmsApnList.remove(pref);
                     }
                 }
                 for (Preference pref : mvnoSpnList) {
                     apnList.removePreference(pref);
+                    mmsApnList.remove(pref);
                 }
             }