diff --git a/Cronet/tests/cts/src/android/net/http/cts/CallbackExceptionTest.kt b/Cronet/tests/cts/src/android/net/http/cts/CallbackExceptionTest.kt index e17b63f0c8..749389eb4b 100644 --- a/Cronet/tests/cts/src/android/net/http/cts/CallbackExceptionTest.kt +++ b/Cronet/tests/cts/src/android/net/http/cts/CallbackExceptionTest.kt @@ -53,7 +53,7 @@ class CallbackExceptionTest { val callback = TestUrlRequestCallback() callback.setFailure(FailureType.THROW_SYNC, ResponseStep.ON_RESPONSE_STARTED) val request = httpEngine - .newUrlRequestBuilder(server.successUrl, callback, callback.executor) + .newUrlRequestBuilder(server.successUrl, callback.executor, callback) .build() request.start() 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 545d8c2685..d24720169b 100644 --- a/Cronet/tests/cts/src/android/net/http/cts/HttpEngineTest.java +++ b/Cronet/tests/cts/src/android/net/http/cts/HttpEngineTest.java @@ -106,7 +106,7 @@ public class HttpEngineTest { .build(); UrlRequest.Builder builder = - mEngine.newUrlRequestBuilder(url, mCallback, mCallback.getExecutor()); + mEngine.newUrlRequestBuilder(url, mCallback.getExecutor(), mCallback); mRequest = builder.build(); mRequest.start(); // This tests uses a non-hermetic server. Instead of asserting, assume the next callback. @@ -117,7 +117,7 @@ public class HttpEngineTest { assertFalse(info.wasCached()); mCallback = new TestUrlRequestCallback(); - builder = mEngine.newUrlRequestBuilder(url, mCallback, mCallback.getExecutor()); + builder = mEngine.newUrlRequestBuilder(url, mCallback.getExecutor(), mCallback); mRequest = builder.build(); mRequest.start(); mCallback.assumeCallback(ResponseStep.ON_SUCCEEDED); @@ -148,7 +148,7 @@ public class HttpEngineTest { // or not. mEngine = mEngineBuilder.setEnablePublicKeyPinningBypassForLocalTrustAnchors(false).build(); UrlRequest.Builder builder = - mEngine.newUrlRequestBuilder(URL, mCallback, mCallback.getExecutor()); + mEngine.newUrlRequestBuilder(URL, mCallback.getExecutor(), mCallback); mRequest = builder.build(); mRequest.start(); mCallback.expectCallback(ResponseStep.ON_SUCCEEDED); @@ -156,7 +156,7 @@ public class HttpEngineTest { mEngine.shutdown(); mEngine = mEngineBuilder.setEnablePublicKeyPinningBypassForLocalTrustAnchors(true).build(); mCallback = new TestUrlRequestCallback(); - builder = mEngine.newUrlRequestBuilder(URL, mCallback, mCallback.getExecutor()); + builder = mEngine.newUrlRequestBuilder(URL, mCallback.getExecutor(), mCallback); mRequest = builder.build(); mRequest.start(); mCallback.expectCallback(ResponseStep.ON_SUCCEEDED); diff --git a/Cronet/tests/cts/src/android/net/http/cts/NetworkExceptionTest.kt b/Cronet/tests/cts/src/android/net/http/cts/NetworkExceptionTest.kt index dd07a413a8..dd4cf0ddf0 100644 --- a/Cronet/tests/cts/src/android/net/http/cts/NetworkExceptionTest.kt +++ b/Cronet/tests/cts/src/android/net/http/cts/NetworkExceptionTest.kt @@ -50,7 +50,7 @@ class NetworkExceptionTest { val httpEngine = HttpEngine.Builder(ApplicationProvider.getApplicationContext()).build() val callback = TestUrlRequestCallback() val request = - httpEngine.newUrlRequestBuilder("http://localhost", callback, callback.executor).build() + httpEngine.newUrlRequestBuilder("http://localhost", callback.executor, callback).build() request.start() callback.blockForDone() diff --git a/Cronet/tests/cts/src/android/net/http/cts/UrlRequestTest.java b/Cronet/tests/cts/src/android/net/http/cts/UrlRequestTest.java index d9af171074..19742e59e8 100644 --- a/Cronet/tests/cts/src/android/net/http/cts/UrlRequestTest.java +++ b/Cronet/tests/cts/src/android/net/http/cts/UrlRequestTest.java @@ -154,7 +154,7 @@ public class UrlRequestTest { TestUrlRequestCallback callback = new TestUrlRequestCallback(); callback.setAllowDirectExecutor(true); UrlRequest.Builder builder = mHttpEngine.newUrlRequestBuilder( - mTestServer.getEchoBodyUrl(), callback, DIRECT_EXECUTOR); + mTestServer.getEchoBodyUrl(), DIRECT_EXECUTOR, callback); UploadDataProvider dataProvider = InMemoryUploadDataProvider.fromUtf8String("test"); builder.setUploadDataProvider(dataProvider, DIRECT_EXECUTOR); builder.addHeader("Content-Type", "text/plain;charset=UTF-8"); @@ -177,7 +177,7 @@ public class UrlRequestTest { callback.setAllowDirectExecutor(true); UrlRequest.Builder builder = mHttpEngine.newUrlRequestBuilder( - mTestServer.getEchoBodyUrl(), callback, Executors.newSingleThreadExecutor()); + mTestServer.getEchoBodyUrl(), Executors.newSingleThreadExecutor(), callback); UploadDataProvider dataProvider = InMemoryUploadDataProvider.fromUtf8String("test"); builder.setUploadDataProvider(dataProvider, DIRECT_EXECUTOR) @@ -197,7 +197,7 @@ public class UrlRequestTest { callback.setAllowDirectExecutor(true); UrlRequest.Builder builder = mHttpEngine.newUrlRequestBuilder( - mTestServer.getEchoBodyUrl(), callback, DIRECT_EXECUTOR); + mTestServer.getEchoBodyUrl(), DIRECT_EXECUTOR, callback); UploadDataProvider dataProvider = InMemoryUploadDataProvider.fromUtf8String("test"); builder.setUploadDataProvider(dataProvider, Executors.newSingleThreadExecutor()) @@ -218,6 +218,7 @@ public class UrlRequestTest { mHttpEngine .newUrlRequestBuilder( mTestServer.getSuccessUrl(), + Executors.newSingleThreadExecutor(), new StubUrlRequestCallback() { @Override public void onResponseStarted( @@ -233,8 +234,7 @@ public class UrlRequestTest { HttpException error) { onFailedException.add(error); } - }, - Executors.newSingleThreadExecutor()) + }) .build(); request.start(); @@ -252,6 +252,7 @@ public class UrlRequestTest { mHttpEngine .newUrlRequestBuilder( mTestServer.getSuccessUrl(), + Executors.newSingleThreadExecutor(), new StubUrlRequestCallback() { @Override public void onResponseStarted( @@ -268,8 +269,7 @@ public class UrlRequestTest { HttpException error) { onFailedException.add(error); } - }, - Executors.newSingleThreadExecutor()) + }) .build(); request.start(); diff --git a/Cronet/tests/cts/src/android/net/http/cts/UrlResponseInfoTest.kt b/Cronet/tests/cts/src/android/net/http/cts/UrlResponseInfoTest.kt index f5b72dcf06..38da9c5e1b 100644 --- a/Cronet/tests/cts/src/android/net/http/cts/UrlResponseInfoTest.kt +++ b/Cronet/tests/cts/src/android/net/http/cts/UrlResponseInfoTest.kt @@ -40,7 +40,7 @@ class UrlResponseInfoTest { val httpEngine = HttpEngine.Builder(context).build() val callback = TestUrlRequestCallback() val url = server.successUrl - val request = httpEngine.newUrlRequestBuilder(url, callback, callback.executor).build() + val request = httpEngine.newUrlRequestBuilder(url, callback.executor, callback).build() request.start() callback.expectCallback(ResponseStep.ON_SUCCEEDED) diff --git a/Tethering/common/TetheringLib/cronet_enabled/api/current.txt b/Tethering/common/TetheringLib/cronet_enabled/api/current.txt index c55fb567df..cf441ce510 100644 --- a/Tethering/common/TetheringLib/cronet_enabled/api/current.txt +++ b/Tethering/common/TetheringLib/cronet_enabled/api/current.txt @@ -118,7 +118,6 @@ package android.net.http { method @NonNull public static String getVersionString(); method @NonNull public abstract android.net.http.BidirectionalStream.Builder newBidirectionalStreamBuilder(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.net.http.BidirectionalStream.Callback); method @NonNull public abstract android.net.http.UrlRequest.Builder newUrlRequestBuilder(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.net.http.UrlRequest.Callback); - method @NonNull public android.net.http.UrlRequest.Builder newUrlRequestBuilder(@NonNull String, @NonNull android.net.http.UrlRequest.Callback, @NonNull java.util.concurrent.Executor); method @NonNull public abstract java.net.URLConnection openConnection(@NonNull java.net.URL) throws java.io.IOException; method public abstract void shutdown(); }