Merge "Update CTS tests to reflect ConnectivityManager API changes." am: 54a417d822

am: 1fd5b6b9a3

Change-Id: I39e3208298ce90cf014074e1f82a4cc5957ff68e

tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java

@@ -419,7 +419,7 @@ public class ConnectivityManagerTest extends AndroidTestCase {
         final TestNetworkCallback callback = new TestNetworkCallback();
         mCm.requestNetwork(new NetworkRequest.Builder()
                 .addTransportType(TRANSPORT_WIFI)
-                .build(), 100, callback);
+                .build(), callback, 100);
 
         try {
             // Wait to get callback for unavailability of requested network