Merge "Refactor TetheringMetricsTest, remove Pair."
diff --git a/Cronet/tests/cts/src/android/net/http/cts/HttpEngineTest.java b/Cronet/tests/cts/src/android/net/http/cts/HttpEngineTest.java
index 816596c..77eb453 100644
--- a/Cronet/tests/cts/src/android/net/http/cts/HttpEngineTest.java
+++ b/Cronet/tests/cts/src/android/net/http/cts/HttpEngineTest.java
@@ -30,6 +30,7 @@
import android.content.Context;
import android.net.Network;
+import android.net.http.ConnectionMigrationOptions;
import android.net.http.HttpEngine;
import android.net.http.UrlRequest;
import android.net.http.UrlResponseInfo;
@@ -301,4 +302,19 @@
UrlResponseInfo info = mCallback.mResponseInfo;
assertOKStatusCode(info);
}
+
+ @Test
+ public void testHttpEngine_setConnectionMigrationOptions_requestSucceeds() {
+ ConnectionMigrationOptions options = new ConnectionMigrationOptions.Builder().build();
+ mEngine = mEngineBuilder.setConnectionMigrationOptions(options).build();
+ UrlRequest.Builder builder =
+ mEngine.newUrlRequestBuilder(
+ mTestServer.getSuccessUrl(), mCallback.getExecutor(), mCallback);
+ mRequest = builder.build();
+ mRequest.start();
+
+ mCallback.expectCallback(ResponseStep.ON_SUCCEEDED);
+ UrlResponseInfo info = mCallback.mResponseInfo;
+ assertOKStatusCode(info);
+ }
}
\ No newline at end of file
diff --git a/Cronet/tests/cts/src/android/net/http/cts/QuicOptionsTest.kt b/Cronet/tests/cts/src/android/net/http/cts/QuicOptionsTest.kt
index 5f9b7d4..a05aecd 100644
--- a/Cronet/tests/cts/src/android/net/http/cts/QuicOptionsTest.kt
+++ b/Cronet/tests/cts/src/android/net/http/cts/QuicOptionsTest.kt
@@ -18,6 +18,7 @@
import android.net.http.QuicOptions
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.google.common.truth.Truth.assertThat
+import java.time.Duration
import org.junit.Test
import org.junit.runner.RunWith
@@ -28,8 +29,7 @@
val quicOptions = QuicOptions.Builder().build()
assertThat(quicOptions.allowedQuicHosts).isEmpty()
assertThat(quicOptions.handshakeUserAgent).isNull()
- // TODO(danstahr): idleConnectionTimeout getter should be public
- // assertThat(quicOptions.idleConnectionTimeout).isNull()
+ assertThat(quicOptions.idleConnectionTimeout).isNull()
assertThat(quicOptions.inMemoryServerConfigsCacheSize).isNull()
}
@@ -46,8 +46,6 @@
.inOrder()
}
- // TODO(danstahr): idleConnectionTimeout getter should be public
- /*
@Test
fun testQuicOptions_idleConnectionTimeout_returnsSetValue() {
val timeout = Duration.ofMinutes(10)
@@ -57,7 +55,6 @@
assertThat(quicOptions.idleConnectionTimeout)
.isEqualTo(timeout)
}
- */
@Test
fun testQuicOptions_inMemoryServerConfigsCacheSize_returnsSetValue() {
diff --git a/service/src/com/android/server/connectivity/AutomaticOnOffKeepaliveTracker.java b/service/src/com/android/server/connectivity/AutomaticOnOffKeepaliveTracker.java
index 9f9b496..6b7222a 100644
--- a/service/src/com/android/server/connectivity/AutomaticOnOffKeepaliveTracker.java
+++ b/service/src/com/android/server/connectivity/AutomaticOnOffKeepaliveTracker.java
@@ -88,7 +88,6 @@
public class AutomaticOnOffKeepaliveTracker {
private static final String TAG = "AutomaticOnOffKeepaliveTracker";
private static final int[] ADDRESS_FAMILIES = new int[] {AF_INET6, AF_INET};
- private static final String EXTRA_BINDER_TOKEN = "token";
private static final long DEFAULT_TCP_POLLING_INTERVAL_MS = 120_000L;
private static final long LOW_TCP_POLLING_INTERVAL_MS = 1_000L;
private static final String AUTOMATIC_ON_OFF_KEEPALIVE_VERSION =