Merge "Fix auto-join and wifiscanner test bed for key change" into m-wireless-dev
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 8800f9a..abf9ab7 100755
--- a/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java
@@ -173,12 +173,13 @@
@Override
public void onSuccess() {
+ Log.d("WifiActionListener onSuccess called for " + mEventType + TAG + "OnSuccess");
mEventFacade.postEvent(mEventType + TAG + "OnSuccess", null);
}
@Override
public void onFailure(int reason) {
- Log.d("WifiActionListener " + mEventType);
+ Log.d("WifiActionListener onFailure called for" + mEventType);
Bundle msg = new Bundle();
msg.putInt("reason", reason);
mEventFacade.postEvent(mEventType + TAG + "OnFailure", msg);
@@ -334,6 +335,7 @@
private WifiConfiguration genWifiConfig(String SSID, String pwd) {
WifiConfiguration wifiConfig = new WifiConfiguration();
wifiConfig.SSID = "\"" + SSID + "\"";
+ Log.v("genWifiConfig pwd " + pwd);
if (pwd == null) {
wifiConfig.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
} else {
@@ -471,7 +473,7 @@
returns = "True if the operation succeeded.")
public Boolean wifiConnect(
@RpcParameter(name = "SSID") String SSID,
- @RpcParameter(name = "Password") @RpcOptional @RpcDefault(value = "") String Password)
+ @RpcParameter(name = "Password") @RpcOptional String Password)
throws ConnectException {
WifiConfiguration wifiConfig = genWifiConfig(SSID, Password);
mWifi.addNetwork(wifiConfig);
@@ -591,7 +593,7 @@
*/
@Rpc(description = "Connects a wifi network as priority by pasing ssid")
public void wifiPriorityConnect(@RpcParameter(name = "SSID") String SSID,
- @RpcParameter(name = "Password") @RpcOptional @RpcDefault(value = "") String Password) {
+ @RpcParameter(name = "Password") @RpcOptional String Password) {
WifiConfiguration wifiConfig = genWifiConfig(SSID, Password);
WifiActionListener listener = new WifiActionListener(mEventFacade, "PriorityConnect");
mWifi.connect(wifiConfig, listener);
diff --git a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java b/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java
index 040c938..ddb2e54 100644
--- a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java
+++ b/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java
@@ -455,8 +455,8 @@
private static JSONObject buildJsonScanResult(ScanResult scanResult) throws JSONException {
JSONObject result = new JSONObject();
- result.put("bssid", scanResult.BSSID);
- result.put("ssid", scanResult.SSID);
+ result.put("BSSID", scanResult.BSSID);
+ result.put("SSID", scanResult.SSID);
result.put("frequency", scanResult.frequency);
result.put("level", scanResult.level);
result.put("capabilities", scanResult.capabilities);
@@ -510,9 +510,9 @@
result.put("link_speed", data.getLinkSpeed());
result.put("network_id", data.getNetworkId());
result.put("rssi", data.getRssi());
- result.put("bssid", data.getBSSID());
+ result.put("BSSID", data.getBSSID());
result.put("mac_address", data.getMacAddress());
- result.put("ssid", data.getSSID());
+ result.put("SSID", data.getSSID());
String supplicantState = "";
switch (data.getSupplicantState()) {
case ASSOCIATED:
@@ -635,11 +635,11 @@
config.put("networkId", data.networkId);
// Trim the double quotes if exist
if (data.SSID.charAt(0) == '"' && data.SSID.charAt(data.SSID.length() - 1) == '"') {
- config.put("ssid", data.SSID.substring(1, data.SSID.length() - 1));
+ config.put("SSID", data.SSID.substring(1, data.SSID.length() - 1));
} else {
- config.put("ssid", data.SSID);
+ config.put("SSID", data.SSID);
}
- config.put("bssid", data.BSSID);
+ config.put("BSSID", data.BSSID);
config.put("priority", data.priority);
config.put("hiddenSSID", data.hiddenSSID);
if (data.status == WifiConfiguration.Status.CURRENT) {
