diff options
| author | Jeremy Joslin <jjoslin@google.com> | 2015-02-12 18:41:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-12 18:41:17 +0000 |
| commit | f456d4dcc042581cb2a3ba540538898f2cc925b7 (patch) | |
| tree | bec610250d4f166787769aa91174398ba65761f2 | |
| parent | 40ab8bb22979b9e7c76e016b861319f6103eb800 (diff) | |
| parent | 20be0e25ba660a7555577988cefcfa36d84e7e2f (diff) | |
| download | frameworks_base-f456d4dcc042581cb2a3ba540538898f2cc925b7.zip frameworks_base-f456d4dcc042581cb2a3ba540538898f2cc925b7.tar.gz frameworks_base-f456d4dcc042581cb2a3ba540538898f2cc925b7.tar.bz2 | |
am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
* commit '20be0e25ba660a7555577988cefcfa36d84e7e2f':
Update Javadoc for EXTRA_NETWORK.
| -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"; |