Merge "Do not call update() for read only APNs." into oc-dev

am: 8f18f8e087

Change-Id: I4afa467be33359cd09fde8d00b62fc299e01a85a

src/com/android/settings/ApnEditor.java

@@ -788,9 +788,14 @@ public class ApnEditor extends SettingsPreferenceFragment
      * Check the key fields' validity and save if valid.
      * @param force save even if the fields are not valid, if the app is
      *        being suspended
-     * @return true if the data was saved
+     * @return true if there's no error
      */
     private boolean validateAndSave(boolean force) {
+        // nothing to do if it's a read only APN
+        if (mReadOnlyApn) {
+            return true;
+        }
+
         String name = checkNotSet(mName.getText());
         String apn = checkNotSet(mApn.getText());
         String mcc = checkNotSet(mMcc.getText());