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

Commit f456d4dc authored by Jeremy Joslin's avatar Jeremy Joslin Committed by Android Git Automerger
Browse files

am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 

* commit '20be0e25':
  Update Javadoc for EXTRA_NETWORK.
parents 40ab8bb2 20be0e25

core/java/android/net/ConnectivityManager.java

+4 −0
Original line number Diff line number Diff line
@@ -2369,6 +2369,10 @@ public class ConnectivityManager { 
     * The lookup key for a {@link Network} object included with the intent after

     * successfully finding a network for the applications request.  Retrieve it with

     * {@link android.content.Intent#getParcelableExtra(String)}.

     * <p>

     * Note that if you intend to invoke (@link #setProcessDefaultNetwork(Network)) or

     * {@link Network#openConnection(java.net.URL)} then you must get a

     * ConnectivityManager instance before doing so.

     */

    public static final String EXTRA_NETWORK = "android.net.extra.NETWORK";