Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1370)

Unified Diff: net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java

Issue 2003503003: Add a null check in ConnectivityManagerDelegate.getNetworkState (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java
diff --git a/net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java b/net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java
index 90fa543d723aa54cfbfcec511d0664059a0a4ac9..70475bd327cbd5cf609c96d8f8559e5d1b5079fa 100644
--- a/net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java
+++ b/net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java
@@ -692,6 +692,13 @@ public class NetworkChangeNotifierTest extends InstrumentationTestCase {
new ConnectivityManagerDelegate(getInstrumentation().getTargetContext());
delegate.getNetworkState();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+ // getNetworkState(Network) doesn't crash upon invalid Network argument.
+ Network invalidNetwork = netIdToNetwork(NetId.INVALID);
+ NetworkState invalidNetworkState = delegate.getNetworkState(invalidNetwork);
+ assertFalse(invalidNetworkState.isConnected());
+ assertEquals(-1, invalidNetworkState.getNetworkType());
+ assertEquals(-1, invalidNetworkState.getNetworkSubType());
+
Network[] networks = delegate.getAllNetworksUnfiltered();
if (networks.length >= 1) {
delegate.getNetworkState(networks[0]);
« no previous file with comments | « net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698