Add a null check in ConnectivityManagerDelegate.getNetworkState

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

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.net;
 
 import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;
 import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
 import static android.net.NetworkCapabilities.TRANSPORT_VPN;
 import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
@@ skipping 673 matching lines @@
      * active network connections so it cannot usefully check results, but it can at least check
      * that the functions don't crash.
      */
     @UiThreadTest
     @MediumTest
     @Feature({"Android-AppBase"})
     public void testConnectivityManagerDelegateDoesNotCrash() {
         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) {
                 delegate.getNetworkState(networks[0]);
             }
             delegate.getDefaultNetId();
             NetworkCallback networkCallback = new NetworkCallback();
             NetworkRequest networkRequest = new NetworkRequest.Builder().build();
             delegate.registerNetworkCallback(networkRequest, networkCallback);
             delegate.unregisterNetworkCallback(networkCallback);
@@ skipping 216 matching lines @@
             mConnectivityDelegate.setActiveNetworkExists(true);
             mConnectivityDelegate.setNetworkType(i);
             mReceiver.onReceive(getInstrumentation().getTargetContext(), intent);
             assertTrue(NetworkChangeNotifier.isOnline());
         }
         mConnectivityDelegate.setActiveNetworkExists(false);
         mReceiver.onReceive(getInstrumentation().getTargetContext(), intent);
         assertFalse(NetworkChangeNotifier.isOnline());
     }
 }