commit 707bac2bdc40e3d98957e134331279534adf8e70
author David Friedman <dmail@google.com> Fri Sep 27 10:30:03 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 27 10:30:03 2013 -0700
tree aa6679e9e603e4507749c1e98784964bcb1b7121
parent 1b8e319784a1bb166aaa6b0f1dc306f8d4b6e57f
parent 0b1cfc1fb64a1b24f107abf106eb839287f65cfb

am 0b1cfc1f: Merge "Docs: In the section "Determine if You Have an Internet Connection," I added to the code snippet so that it also checks whether activeNetwork is null. Bug: 10797360" into jb-mr2-docs

* commit '0b1cfc1fb64a1b24f107abf106eb839287f65cfb':
  Docs: In the section "Determine if You Have an Internet Connection," I added to the code snippet so that it also checks whether activeNetwork is null. Bug: 10797360

docs/html/training/monitoring-device-state/connectivity-monitoring.jd

diff --git a/docs/html/training/monitoring-device-state/connectivity-monitoring.jd b/docs/html/training/monitoring-device-state/connectivity-monitoring.jd
index 11a05e1..fb5096d 100644
--- a/docs/html/training/monitoring-device-state/connectivity-monitoring.jd
+++ b/docs/html/training/monitoring-device-state/connectivity-monitoring.jd
@@ -49,7 +49,8 @@
         (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
  
 NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
-boolean isConnected = activeNetwork.isConnectedOrConnecting();</pre>
+boolean isConnected = activeNetwork != null &&
+                      activeNetwork.isConnectedOrConnecting();</pre>
 
 
 <h2 id="DetermineType">Determine the Type of your Internet Connection</h2>