Merge "Preserve leading 0s in mcc mnc" am: 593d767e15

am: c2a5c47290

Change-Id: Id1a84cc4cc55fef4167f28ab0e665ebffe5d2c05

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

@@ -313,12 +313,22 @@ public class ApnEditor extends SettingsPreferenceFragment
     static String formatInteger(String value) {
         try {
             final int intValue = Integer.parseInt(value);
-            return String.format("%d", intValue);
+            return String.format(getCorrectDigitsFormat(value), intValue);
         } catch (NumberFormatException e) {
             return value;
         }
     }
 
+    /**
+     * Get the digits format so we preserve leading 0's.
+     * MCCs are 3 digits and MNCs are either 2 or 3.
+     */
+    static String getCorrectDigitsFormat(String value) {
+        if (value.length() == 2) return "%02d";
+        else return "%03d";
+    }
+
+
     /**
      * Check if passed in array of APN types indicates all APN types
      * @param apnTypes array of APN types. "*" indicates all types.

tests/robotests/src/com/android/settings/network/ApnEditorTest.java

@@ -440,6 +440,8 @@ public class ApnEditorTest {
     @Test
     public void formatInteger_shouldParseString() {
         assertThat(ApnEditor.formatInteger("42")).isEqualTo("42");
+        assertThat(ApnEditor.formatInteger("01")).isEqualTo("01");
+        assertThat(ApnEditor.formatInteger("001")).isEqualTo("001");
     }
 
     @Test
@@ -489,4 +491,4 @@ public class ApnEditorTest {
             mUri = uri;
         }
     }
-}
+}