commit ca5c6cb300d660bc2e77bed0cfdb7010362089b2
author Nathan Harold <nharold@google.com> Fri Sep 09 18:05:11 2016 -0700
committer Nathan Harold <nharold@google.com> Fri Sep 09 18:05:11 2016 -0700
tree f348f37542f1b197390a9e0df3152bf07c3f01c3
parent 94a5e8a562899e47d303c1ff7300c345f7d0823f

Add Error Checks in wifiConnect and wifiEnterpriseConnect

Bug: 31404763
Change-Id: I5faafdcf47a80064d1ef8e1d6531cb9b5e79def1

Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java

diff --git a/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java b/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java
index dab63c4..b406e1d 100755
--- a/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java
@@ -524,7 +524,10 @@
             Log.e("Got negative network Id.");
             return false;
         }
-        mWifi.enableNetwork(nId, true);
+        if (!mWifi.enableNetwork(nId, true)) {
+            Log.e("Failed to enable wifi network.");
+            return false;
+        }
         return mWifi.reconnect();
     }
 
@@ -550,18 +553,22 @@
     }
 
     @Rpc(description = "Connect to a wifi network that uses Enterprise authentication methods.")
-    public void wifiEnterpriseConnect(@RpcParameter(name = "config") JSONObject config)
+    public Boolean wifiEnterpriseConnect(@RpcParameter(name = "config") JSONObject config)
             throws JSONException, GeneralSecurityException {
         // Create Certificate
         WifiActionListener listener = new WifiActionListener(mEventFacade, "EnterpriseConnect");
         WifiConfiguration wifiConfig = genWifiEnterpriseConfig(config);
         if (wifiConfig.isPasspoint()) {
             Log.d("Got a passpoint config, add it and save config.");
-            mWifi.addNetwork(wifiConfig);
-            mWifi.saveConfiguration();
+            if (mWifi.addNetwork(wifiConfig) == -1) {
+                Log.e("Failed to add a wifi network");
+                return false;
+            }
+            return mWifi.saveConfiguration();
         } else {
             Log.d("Got a non-passpoint enterprise config, connect directly.");
             mWifi.connect(wifiConfig, listener);
+            return true;
         }
     }