Add a null check in ConnectivityManagerDelegate.getNetworkState

net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java

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..359edb9e4ac52dde94232cb78b3fcb04268db45e 100644
--- a/net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java
+++ b/net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java
@@ -691,6 +691,14 @@ public class NetworkChangeNotifierTest extends InstrumentationTestCase {
         ConnectivityManagerDelegate delegate =
                 new ConnectivityManagerDelegate(getInstrumentation().getTargetContext());
         delegate.getNetworkState();
+
+        // getNetworkState doesn't crash upon invalid Network argument.
+        Network invalidNetwork = null;

[pauljensen, 2016/05/21 00:33:03]

nit: instead of null, maybe you could use netIdToNetwork(NetId.INVALID)

[xunjieli, 2016/05/23 13:05:54]

Done.

+        NetworkState invalidNetworkState = delegate.getNetworkState(invalidNetwork);
+        assertFalse(invalidNetworkState.isConnected());
+        assertEquals(-1, invalidNetworkState.getNetworkType());
+        assertEquals(-1, invalidNetworkState.getNetworkSubType());
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             Network[] networks = delegate.getAllNetworksUnfiltered();
             if (networks.length >= 1) {