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

* commit '20be0e25ba660a7555577988cefcfa36d84e7e2f':
  Update Javadoc for EXTRA_NETWORK.
This commit is contained in:
Jeremy Joslin
2015-02-12 18:41:17 +00:00
committed by Android Git Automerger

View File

@@ -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";