commit 2f492604e5d9375ddb522360402df56e89389b48
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 27 08:41:57 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 27 08:41:57 2020 +0000
tree 76978a176010a5303bb4f6a2c875d6da20c1b89d
parent c023e758f77b16bf33cd60e0f11b742303510d1a
parent c12b1b40ee20b74b146efebdd564527475ecb40b

Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev

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

diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java
index 091e7f5..6de2550 100644
--- a/src/com/android/settings/network/ApnEditor.java
+++ b/src/com/android/settings/network/ApnEditor.java
@@ -39,6 +39,7 @@
 import android.view.View;
 import android.view.View.OnKeyListener;
 
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.app.AlertDialog;
 import androidx.preference.EditTextPreference;
@@ -388,8 +389,12 @@
         for (int i = 0; i < getPreferenceScreen().getPreferenceCount(); i++) {
             getPreferenceScreen().getPreference(i).setOnPreferenceChangeListener(this);
         }
+    }
 
-        fillUI(icicle == null);
+    @Override
+    public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
+        super.onViewStateRestored(savedInstanceState);
+        fillUI(savedInstanceState == null);
     }
 
     @VisibleForTesting