commit 2cdb07227e965c9e14968be62a9e9a3fbc6c79b3
author Girish Moturu <gmoturu@google.com> Fri Mar 03 01:59:28 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 03 01:59:29 2017 +0000
tree e363407f0f6ff9beacce8486c63e63ec87494458
parent 0fe8e6bb24a65f02eee107b2f405fe2d47ea8736
parent 5924fafb30d81b920252897910fb1659af5187a6

Merge "Facade changes for WifiTetheringTest"

Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java

diff --git a/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java b/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java
index 83a5c7e..5100834 100644
--- a/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java
@@ -799,6 +799,11 @@
         return inet6Address.getHostAddress();
     }
 
+    @Rpc(description = "Returns active link properties")
+    public LinkProperties connectivityGetActiveLinkProperties() {
+        return mManager.getActiveLinkProperties();
+    }
+
     @Override
     public void shutdown() {
         connectivityStopTrackingConnectivityStateChange();

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

diff --git a/Common/src/com/googlecode/android_scripting/facade/wifi/HttpFacade.java b/Common/src/com/googlecode/android_scripting/facade/wifi/HttpFacade.java
index 5c724de..f8fbd20 100644
--- a/Common/src/com/googlecode/android_scripting/facade/wifi/HttpFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/wifi/HttpFacade.java
@@ -209,7 +209,8 @@
     @Rpc(description = "Ping to host(URL or IP), return success (true) or fail (false).")
     // The optional timeout parameter is in unit of second.
     public Boolean pingHost(@RpcParameter(name = "host") String hostString,
-            @RpcParameter(name = "timeout") @RpcOptional Integer timeout) {
+            @RpcParameter(name = "timeout") @RpcOptional Integer timeout,
+            @RpcParameter(name = "ping") @RpcOptional String pingType) {
         try {
             String host;
             try {
@@ -222,6 +223,9 @@
 
             Log.d("Host:" + host);
             String pingCmdString = "ping -c 1 ";
+            if(pingType!=null && pingType.equals("ping6")) {
+                pingCmdString = "ping6 -c 1 ";
+            }
             if (timeout != null) {
                 pingCmdString = pingCmdString + "-W " + timeout + " ";
             }