diff options
| author | Jeremy Joslin <jjoslin@google.com> | 2015-02-12 18:34:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-12 18:34:03 +0000 |
| commit | 20be0e25ba660a7555577988cefcfa36d84e7e2f (patch) | |
| tree | 30eda19f6d8794797d4d94f9c579620380c39ef3 /core/java | |
| parent | c70d0e71c09da0292958d748cedaa5fbacbec74a (diff) | |
| parent | fcde58f155e8a188078885ec7529a9fe4a67f10e (diff) | |
| download | frameworks_base-20be0e25ba660a7555577988cefcfa36d84e7e2f.zip frameworks_base-20be0e25ba660a7555577988cefcfa36d84e7e2f.tar.gz frameworks_base-20be0e25ba660a7555577988cefcfa36d84e7e2f.tar.bz2 | |
Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index cdc8661..eb2df0b 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -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"; |