From efe090ec60ffa8dc0d5763e9163285f243d048a0 Mon Sep 17 00:00:00 2001
From: Amit Mahajan <amitmahajan@google.com>
Date: Wed, 2 Aug 2017 09:59:03 -0700
Subject: [PATCH] Change to not cache user entered apn type as user may change
 it.

Test: manual
Bug: 64263412
Change-Id: Idc49109926e123eddec7f6553f3c493b1ed22212
---
 src/com/android/settings/ApnEditor.java | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index ba160abc43..f67f50309b 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -118,7 +118,6 @@ public class ApnEditor extends SettingsPreferenceFragment
     private String[] mReadOnlyApnTypes;
     private String[] mReadOnlyApnFields;
     private boolean mReadOnlyApn;
-    private String mUserEnteredApnType;
 
     /**
      * Standard projection for the interesting columns of a normal note.
@@ -214,7 +213,6 @@ public class ApnEditor extends SettingsPreferenceFragment
         mReadOnlyApn = false;
         mReadOnlyApnTypes = null;
         mReadOnlyApnFields = null;
-        mUserEnteredApnType = null;
 
         CarrierConfigManager configManager = (CarrierConfigManager)
                 getSystemService(Context.CARRIER_CONFIG_SERVICE);
@@ -1117,15 +1115,11 @@ public class ApnEditor extends SettingsPreferenceFragment
     }
 
     private String getUserEnteredApnType() {
-        if (mUserEnteredApnType != null) {
-            return mUserEnteredApnType;
-        }
-
         // if user has not specified a type, map it to "ALL APN TYPES THAT ARE NOT READ-ONLY"
-        mUserEnteredApnType = mApnType.getText();
-        if (mUserEnteredApnType != null) mUserEnteredApnType = mUserEnteredApnType.trim();
-        if ((TextUtils.isEmpty(mUserEnteredApnType)
-                || PhoneConstants.APN_TYPE_ALL.equals(mUserEnteredApnType))
+        String userEnteredApnType = mApnType.getText();
+        if (userEnteredApnType != null) userEnteredApnType = userEnteredApnType.trim();
+        if ((TextUtils.isEmpty(userEnteredApnType)
+                || PhoneConstants.APN_TYPE_ALL.equals(userEnteredApnType))
                 && !ArrayUtils.isEmpty(mReadOnlyApnTypes)) {
             StringBuilder editableApnTypes = new StringBuilder();
             List<String> readOnlyApnTypes = Arrays.asList(mReadOnlyApnTypes);
@@ -1143,12 +1137,12 @@ public class ApnEditor extends SettingsPreferenceFragment
                     editableApnTypes.append(apnType);
                 }
             }
-            mUserEnteredApnType = editableApnTypes.toString();
+            userEnteredApnType = editableApnTypes.toString();
             Log.d(TAG, "getUserEnteredApnType: changed apn type to editable apn types: "
-                    + mUserEnteredApnType);
+                    + userEnteredApnType);
         }
 
-        return mUserEnteredApnType;
+        return userEnteredApnType;
     }
 
     public static class ErrorDialog extends InstrumentedDialogFragment {
-- 
2.11.0