summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorkmccormick <kmccormick@google.com>2013-04-03 18:45:29 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-03 18:45:29 -0700
commitfb9a9713f44f61958c02fb8af72fd6a61d44f2e7 (patch)
tree72dd0326bc35b2e17f0693a24839effdb54feed4 /docs
parent9b9c895774d53e14b42957c2bcd8c39ae2c79fb1 (diff)
parent614c155fc6e4c3e83b152398df0e628d7a7f4051 (diff)
downloadframeworks_base-fb9a9713f44f61958c02fb8af72fd6a61d44f2e7.zip
frameworks_base-fb9a9713f44f61958c02fb8af72fd6a61d44f2e7.tar.gz
frameworks_base-fb9a9713f44f61958c02fb8af72fd6a61d44f2e7.tar.bz2
am 614c155f: am f64ad28f: am 15ebf622: am f614d536: am e4922f28: Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs
* commit '614c155fc6e4c3e83b152398df0e628d7a7f4051': Doc update: clean up text and code snippets
Diffstat (limited to 'docs')
-rw-r--r--docs/html/training/basics/network-ops/connecting.jd4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/training/basics/network-ops/connecting.jd b/docs/html/training/basics/network-ops/connecting.jd
index ac8d993..50a9e1b 100644
--- a/docs/html/training/basics/network-ops/connecting.jd
+++ b/docs/html/training/basics/network-ops/connecting.jd
@@ -136,7 +136,7 @@ public class HttpExampleActivity extends Activity {
getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo networkInfo = connMgr.getActiveNetworkInfo();
if (networkInfo != null &amp;&amp; networkInfo.isConnected()) {
- new DownloadWebpageText().execute(stringUrl);
+ new DownloadWebpageTask().execute(stringUrl);
} else {
textView.setText("No network connection available.");
}
@@ -147,7 +147,7 @@ public class HttpExampleActivity extends Activity {
// has been established, the AsyncTask downloads the contents of the webpage as
// an InputStream. Finally, the InputStream is converted into a string, which is
// displayed in the UI by the AsyncTask's onPostExecute method.
- private class DownloadWebpageText extends AsyncTask<String, Void, String> {
+ private class DownloadWebpageTask extends AsyncTask&lt;String, Void, String&gt; {
&#64;Override
protected String doInBackground(String... urls) {