Commit 707bac2b authored Sep 27, 2013 by David Friedman Committed by Android Git Automerger Sep 27, 2013

am 0b1cfc1f: Merge "Docs: In the section "Determine if You Have an Internet...

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 '0b1cfc1f':
  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

parents 1b8e3197 0b1cfc1f

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,8 @@ to query the active network and determine if it has Internet connectivity.</p>
		(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>