commit bc29fc31b5284a1d008b27dac4e4512aa1f16420
author Yang Liu <yangxliu@google.com> Wed Jun 03 18:25:15 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 03 18:25:16 2015 +0000
tree 39f1f307659d8d960b983ae24ddddda45cef3b71
parent db0ebe5185b8c58297177aa46080993ef8b2c777
parent 99381475675a75aa3f7d535ae94b95e2c00e636d

Merge "WiFi Tethering test: add necessary new APIs." into mnc-dev

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 781a8eb..b04ba63 100755
--- a/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java
@@ -425,6 +425,9 @@
         } else {
             config.allowedKeyManagement.set(KeyMgmt.NONE);
         }
+        if (j.has("apBand")) {
+            config.apBand = j.getInt("apBand");
+        }
         return config;
     }
 

Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java

diff --git a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java b/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java
index 8a88188..0b58f4b 100644
--- a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java
+++ b/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java
@@ -635,6 +635,8 @@
                 supplicantState = null;
         }
         result.put("supplicant_state", build(supplicantState));
+        result.put("is_5ghz", data.is5GHz());
+        result.put("is_24ghz", data.is24GHz());
         return result;
     }