commit 563d2d5a290387cbede8b0f2a39e133e95265790
author Amit Mahajan <amitmahajan@google.com> Mon Apr 24 22:19:40 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 24 22:19:40 2017 +0000
tree 3b40c72b0026e399e1b6b01367d8001562a84f89
parent 8c6327cfe5e93274b724bd169669a2daf6e417fb
parent 8f18f8e08752237b1a96361eda2ad0870ba56161

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

Change-Id: I4afa467be33359cd09fde8d00b62fc299e01a85a

src/com/android/settings/ApnEditor.java

diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index f97811c..f668957 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -788,9 +788,14 @@
      * 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());