commit a75a5ea80b9651472e9209364987460eb561ec64
author Irfan Sheriff <isheriff@google.com> Wed Jul 27 20:40:27 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 27 20:40:27 2011 -0700
tree 4fde9b8ffd16b3054ca97bc4ab8f99f7592d013f
parent 91eb8e178e7dadc7e4d1644960047c96316ed2b1
parent c7787a78f74a41820cfc31ff5fd51ee8d8c6df17

Merge "Fix NPE from monkey run"

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

diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 897280f..876fd99 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -112,8 +112,8 @@
     private TextView mProxyPortView;
     private TextView mProxyExclusionListView;
 
-    private IpAssignment mIpAssignment;
-    private ProxySettings mProxySettings;
+    private IpAssignment mIpAssignment = IpAssignment.UNASSIGNED;
+    private ProxySettings mProxySettings = ProxySettings.UNASSIGNED;
     private LinkProperties mLinkProperties = new LinkProperties();
 
     // True when this instance is used in SetupWizard XL context.