commit 3e737d1cf086c41fc04e822e44df32c7ce8c0b90
author Erik Kline <ek@google.com> Fri May 26 09:55:29 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 26 09:55:29 2017 +0000
tree bc8f2a532ca1dfa1b7472425bcae973a2ce962f5
parent 3bb97f1b9bf6b85346ab15f51be92622d73da544
parent dfd185c62fb3d38c629eb2e4d840ca58dece4e8e

Merge "WifiManager: add iface name and mode labels" into oc-dev
am: dfd185c62f

Change-Id: I67f82525b5c0fa5b81235311988c9b186d16077a

wifi/java/android/net/wifi/WifiManager.java

diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 25d61af..cfc1fd2 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -383,6 +383,21 @@
     @SystemApi
     public static final String EXTRA_PREVIOUS_WIFI_AP_STATE = "previous_wifi_state";
     /**
+     * The interface used for the softap.
+     *
+     * @hide
+     */
+    public static final String EXTRA_WIFI_AP_INTERFACE_NAME = "wifi_ap_interface_name";
+    /**
+     * The intended ip mode for this softap.
+     * @see #IFACE_IP_MODE_TETHERED
+     * @see #IFACE_IP_MODE_LOCAL_ONLY
+     *
+     * @hide
+     */
+    public static final String EXTRA_WIFI_AP_MODE = "wifi_ap_mode";
+
+    /**
      * Wi-Fi AP is currently being disabled. The state will change to
      * {@link #WIFI_AP_STATE_DISABLED} if it finishes successfully.
      *