diff options
| author | 2012-04-19 15:12:35 -0700 | |
|---|---|---|
| committer | 2012-04-19 15:12:35 -0700 | |
| commit | 6ec0c6afafd9bad5e4c33578e9355997a280649c (patch) | |
| tree | 2c4a3b41943d92081d49db4f534983f09d7ad721 | |
| parent | 661f362a2c531c46fdce5359b176a30ba7d16e1f (diff) | |
| parent | 232ebad9ed1d81d5eab12e0b41cbe522e9a3c320 (diff) | |
Merge "Expose NO_SERVICE_REQUESTS error condition"
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/p2p/WifiP2pManager.java | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 20c0b55bd9ac..c912541c63b7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -13081,6 +13081,7 @@ package android.net.wifi.p2p { field public static final java.lang.String EXTRA_WIFI_P2P_DEVICE = "wifiP2pDevice"; field public static final java.lang.String EXTRA_WIFI_P2P_INFO = "wifiP2pInfo"; field public static final java.lang.String EXTRA_WIFI_STATE = "wifi_p2p_state"; + field public static final int NO_SERVICE_REQUESTS = 3; // 0x3 field public static final int P2P_UNSUPPORTED = 1; // 0x1 field public static final java.lang.String WIFI_P2P_CONNECTION_CHANGED_ACTION = "android.net.wifi.p2p.CONNECTION_STATE_CHANGE"; field public static final java.lang.String WIFI_P2P_DISCOVERY_CHANGED_ACTION = "android.net.wifi.p2p.DISCOVERY_STATE_CHANGE"; diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pManager.java b/wifi/java/android/net/wifi/p2p/WifiP2pManager.java index df14bb9b4838..018e0a820f4f 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pManager.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pManager.java @@ -415,8 +415,8 @@ public class WifiP2pManager { /** * Passed with {@link ActionListener#onFailure}. * Indicates that the {@link #discoverServices} failed because no service - * requests are set. - * @hide + * requests are added. Use {@link #addServiceRequest} to add a service + * request. */ public static final int NO_SERVICE_REQUESTS = 3; |