commit 7e9d6a8e558ad9208499bc4b6b83fc8f1649ad17
author Robert Greenwalt <rgreenwalt@google.com> Mon Jul 29 16:53:10 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 29 16:53:10 2013 -0700
tree a8d0e23297f8f250988de335a305cd0d72c8725e
parent 0125d032ef68358502a284738271bdc4aa2a9c83
parent 5b7bf112f55639668b34919dcf2ba19f2cfffaa3

am 5b7bf112: am 35a2d796: Merge "Fix "Add Network" show last selected WiFi AP Dialog"

* commit '5b7bf112f55639668b34919dcf2ba19f2cfffaa3':
  Fix "Add Network" show last selected WiFi AP Dialog

src/com/android/settings/wifi/WifiSettings.java

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index cb35e10..24f56c1 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -646,6 +646,8 @@
                         ap = new AccessPoint(getActivity(), mAccessPointSavedState);
                         // For repeated orientation changes
                         mDlgAccessPoint = ap;
+                        // Reset the saved access point data
+                        mAccessPointSavedState = null;
                     }
                 }
                 // If it's still null, fine, it's for Add Network