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..7daac3241e3bb91d447d9875b6b8288cda579f63 100644
--- a/net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java
+++ b/net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java
@@ -691,6 +691,17 @@ public class NetworkChangeNotifierTest extends InstrumentationTestCase {
         ConnectivityManagerDelegate delegate =
                 new ConnectivityManagerDelegate(getInstrumentation().getTargetContext());
         delegate.getNetworkState();
+
+        // getNetworkState doesn't crash upon invalid Network argument.
+        Network invalidNetwork = null;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            invalidNetwork = netIdToNetwork(NetId.INVALID);

[xunjieli, 2016/05/23 16:45:03]

Paul, netIdToNetwork uses mNetworkConstructor which is only initialized on L+.
Should I surround the call using a conditional? Paul, PTAL.

[pauljensen, 2016/05/23 17:19:40]

is delegate.getNetworkState(Network) callable on pre-Lollipop?
The Network class didn't even exist back then
I think we should move this whole test into the "if (Build.VERSION.SDK_INT >=
Build.VERSION_CODES.LOLLIPOP) {" block below

[xunjieli, 2016/05/23 17:27:01]

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) {