diff options
| author | Jaewan Kim <jaewan@google.com> | 2014-05-23 16:48:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-23 16:48:16 +0000 |
| commit | a06d76b139b85bd28e87c390d97d1ee165a1430b (patch) | |
| tree | e65a4b80ead4adf0babbae3f6f1a5281cf091bc5 /core/java | |
| parent | d08f91fa679d3045436e993b6073d86d8f9b26fe (diff) | |
| parent | bd8a374016cd83c70fe2297770fbe13a5d460148 (diff) | |
| download | frameworks_base-a06d76b139b85bd28e87c390d97d1ee165a1430b.zip frameworks_base-a06d76b139b85bd28e87c390d97d1ee165a1430b.tar.gz frameworks_base-a06d76b139b85bd28e87c390d97d1ee165a1430b.tar.bz2 | |
Merge "Fix Ethernet documentation." into lmp-preview-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/Context.java | 4 | ||||
| -rw-r--r-- | core/java/android/net/EthernetManager.java | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index d0ac9c9..6ae006c 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -1994,6 +1994,7 @@ public abstract class Context { WIFI_PASSPOINT_SERVICE, WIFI_P2P_SERVICE, WIFI_SCANNING_SERVICE, + //@hide: ETHERNET_SERVICE, NSD_SERVICE, AUDIO_SERVICE, MEDIA_ROUTER_SERVICE, @@ -2069,9 +2070,6 @@ public abstract class Context { * <dt> {@link #WIFI_P2P_SERVICE} ("wifip2p") * <dd> A {@link android.net.wifi.p2p.WifiP2pManager WifiP2pManager} for management of * Wi-Fi Direct connectivity. - * <dt> {@link #ETHERNET_SERVICE} ("ethernet") - * <dd> A {@link android.net.ethernet.EthernetManager EthernetManager} for - * management of Ethernet connectivity. * <dt> {@link #INPUT_METHOD_SERVICE} ("input_method") * <dd> An {@link android.view.inputmethod.InputMethodManager InputMethodManager} * for management of input methods. diff --git a/core/java/android/net/EthernetManager.java b/core/java/android/net/EthernetManager.java index 70cc708..5df4baf 100644 --- a/core/java/android/net/EthernetManager.java +++ b/core/java/android/net/EthernetManager.java @@ -47,7 +47,7 @@ public class EthernetManager { } /** - * Get Ethernet configuration + * Get Ethernet configuration. * @return the Ethernet Configuration, contained in {@link IpConfiguration}. */ public IpConfiguration getConfiguration() { @@ -61,8 +61,7 @@ public class EthernetManager { } /** - * Set Ethernet configuration - * @return true if setting success + * Set Ethernet configuration. */ public void setConfiguration(IpConfiguration config) { try { |