commit 1f98bc28d6922a750f59b826d2018097535510ab
author Sarah Chin <sarahchin@google.com> Wed Sep 15 14:08:48 2021 -0700
committer Sarah Chin <sarahchin@google.com> Wed Oct 13 18:40:43 2021 +0000
tree f6fe48075637849fafc4ba8fe234222033b04120
parent e7f8a872a5f18ad9db4a523c26926f6b8d4cb3a8

Remove IMS from editabe APNs

If APN type is not specified, it will default to all APN types.
Remove IMS from editable APN types to prevent both default and IMS on
the same connection.

Test: make RunSettingsRoboTests
Bug: 195105491
Change-Id: I0db32412e8a2948509f235c94e1d681001b79995

src/com/android/settings/network/apn/ApnEditor.java

diff --git a/src/com/android/settings/network/apn/ApnEditor.java b/src/com/android/settings/network/apn/ApnEditor.java
index 0b75162..03db1b8 100644
--- a/src/com/android/settings/network/apn/ApnEditor.java
+++ b/src/com/android/settings/network/apn/ApnEditor.java
@@ -1256,7 +1256,8 @@
             if (!readOnlyApnTypes.contains(apnType)
                     && !apnType.equals(APN_TYPE_IA)
                     && !apnType.equals(APN_TYPE_EMERGENCY)
-                    && !apnType.equals(APN_TYPE_MCX)) {
+                    && !apnType.equals(APN_TYPE_MCX)
+                    && !apnType.equals(APN_TYPE_IMS)) {
                 if (first) {
                     first = false;
                 } else {