Merge "Expose WifiManager.setTdlsEnabled public API" into klp-dev

1 files changed, 18 insertions, 12 deletions

diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index a15b664..5f5d54f 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -1234,16 +1234,26 @@ public class WifiManager {
 
 
     /**
-     * Enable TDLS on a specific local route
+     * Enable/Disable TDLS on a specific local route.
      *
-     * This API is used by WiFi display, but eventually it can be made public,
-     * just depends on how popular TDLS gets
+     * <p>
+     * TDLS enables two wireless endpoints to talk to each other directly
+     * without going through the access point that is managing the local
+     * network. It saves bandwidth and improves quality of the link.
+     * </p>
+     * <p>
+     * This API enables/disables the option of using TDLS. If enabled, the
+     * underlying hardware is free to use TDLS or a hop through the access
+     * point. If disabled, existing TDLS session is torn down and
+     * hardware is restricted to use access point for transferring wireless
+     * packets. Default value for all routes is 'disabled', meaning restricted
+     * to use access point for transferring packets.
+     * </p>
      *
      * @param remoteIPAddress IP address of the endpoint to setup TDLS with
      * @param enable true = setup and false = tear down TDLS
-     * @hide
      */
-    public void enableTdls(InetAddress remoteIPAddress, boolean enable) {
+    public void setTdlsEnabled(InetAddress remoteIPAddress, boolean enable) {
         try {
             mService.enableTdls(remoteIPAddress.getHostAddress(), enable);
         } catch (RemoteException e) {
@@ -1252,16 +1262,12 @@ public class WifiManager {
     }
 
     /**
-     * Enable TDLS on a specific local route
-     *
-     * This API is used by WiFi display, but eventually it can be made public,
-     * just depends on how popular TDLS gets
-     *
+     * Similar to {@link #setTdlsEnabled(InetAddress, boolean) }, except
+     * this version allows you to specify remote endpoint with a MAC address.
      * @param remoteMacAddress MAC address of the remote endpoint such as 00:00:0c:9f:f2:ab
      * @param enable true = setup and false = tear down TDLS
-     * @hide
      */
-    public void enableTdlsWithMacAddress(String remoteMacAddress, boolean enable) {
+    public void setTdlsEnabledWithMacAddress(String remoteMacAddress, boolean enable) {
         try {
             mService.enableTdlsWithMacAddress(remoteMacAddress, enable);
         } catch (RemoteException e) {