Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8aad1b6 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android (Google) Code Review
Browse files

Merge "Fix Ethernet documentation."

parents f13cd857 9c1ccc54

core/java/android/content/Context.java

+1 −3
Original line number Diff line number Diff line
@@ -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.

core/java/android/net/EthernetManager.java

+2 −3
Original line number Diff line number Diff line
@@ -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 {