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

Commit 1084df02 authored by Jeremy Joslin's avatar Jeremy Joslin Committed by android-build-merger
Browse files

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

automerge: f69f3737

* commit 'f69f3737':
  Update Javadoc for EXTRA_NETWORK.
parents d51584de f69f3737

core/java/android/net/ConnectivityManager.java

+4 −0
Original line number Diff line number Diff line
@@ -2371,6 +2371,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";