From d41fa7b77c41645f33743f955db2a2cd2d9d57ae Mon Sep 17 00:00:00 2001 From: Motomu Utsumi Date: Tue, 7 Mar 2023 19:03:16 +0900 Subject: [PATCH] cronet: Make BidirectionalStream.Callback interface Bug: 271423645 Bug: 265674359 Test: TH Change-Id: I0efb1ad4719a62b1e7ad2c96af0660e212dbb966 --- .../cts/util/TestBidirectionalStreamCallback.java | 2 +- .../TetheringLib/cronet_enabled/api/current.txt | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Cronet/tests/cts/src/android/net/http/cts/util/TestBidirectionalStreamCallback.java b/Cronet/tests/cts/src/android/net/http/cts/util/TestBidirectionalStreamCallback.java index 9d40e43d3e..1e7333c75f 100644 --- a/Cronet/tests/cts/src/android/net/http/cts/util/TestBidirectionalStreamCallback.java +++ b/Cronet/tests/cts/src/android/net/http/cts/util/TestBidirectionalStreamCallback.java @@ -44,7 +44,7 @@ import java.util.concurrent.ThreadFactory; * the stream completes on another thread. Allows to cancel, block stream or throw an exception from * an arbitrary step. */ -public class TestBidirectionalStreamCallback extends BidirectionalStream.Callback { +public class TestBidirectionalStreamCallback implements BidirectionalStream.Callback { private static final int TIMEOUT_MS = 12_000; public UrlResponseInfo mResponseInfo; public HttpException mError; diff --git a/Tethering/common/TetheringLib/cronet_enabled/api/current.txt b/Tethering/common/TetheringLib/cronet_enabled/api/current.txt index ccbde93313..ba016c0aa0 100644 --- a/Tethering/common/TetheringLib/cronet_enabled/api/current.txt +++ b/Tethering/common/TetheringLib/cronet_enabled/api/current.txt @@ -35,16 +35,15 @@ package android.net.http { method @NonNull public abstract android.net.http.BidirectionalStream.Builder setTrafficStatsUid(int); } - public abstract static class BidirectionalStream.Callback { - ctor public BidirectionalStream.Callback(); + public static interface BidirectionalStream.Callback { method public void onCanceled(@NonNull android.net.http.BidirectionalStream, @Nullable android.net.http.UrlResponseInfo); - method public abstract void onFailed(@NonNull android.net.http.BidirectionalStream, @Nullable android.net.http.UrlResponseInfo, @NonNull android.net.http.HttpException); - method public abstract void onReadCompleted(@NonNull android.net.http.BidirectionalStream, @NonNull android.net.http.UrlResponseInfo, @NonNull java.nio.ByteBuffer, boolean); - method public abstract void onResponseHeadersReceived(@NonNull android.net.http.BidirectionalStream, @NonNull android.net.http.UrlResponseInfo); + method public void onFailed(@NonNull android.net.http.BidirectionalStream, @Nullable android.net.http.UrlResponseInfo, @NonNull android.net.http.HttpException); + method public void onReadCompleted(@NonNull android.net.http.BidirectionalStream, @NonNull android.net.http.UrlResponseInfo, @NonNull java.nio.ByteBuffer, boolean); + method public void onResponseHeadersReceived(@NonNull android.net.http.BidirectionalStream, @NonNull android.net.http.UrlResponseInfo); method public void onResponseTrailersReceived(@NonNull android.net.http.BidirectionalStream, @NonNull android.net.http.UrlResponseInfo, @NonNull android.net.http.HeaderBlock); - method public abstract void onStreamReady(@NonNull android.net.http.BidirectionalStream); - method public abstract void onSucceeded(@NonNull android.net.http.BidirectionalStream, @NonNull android.net.http.UrlResponseInfo); - method public abstract void onWriteCompleted(@NonNull android.net.http.BidirectionalStream, @NonNull android.net.http.UrlResponseInfo, @NonNull java.nio.ByteBuffer, boolean); + method public void onStreamReady(@NonNull android.net.http.BidirectionalStream); + method public void onSucceeded(@NonNull android.net.http.BidirectionalStream, @NonNull android.net.http.UrlResponseInfo); + method public void onWriteCompleted(@NonNull android.net.http.BidirectionalStream, @NonNull android.net.http.UrlResponseInfo, @NonNull java.nio.ByteBuffer, boolean); } public abstract class CallbackException extends android.net.http.HttpException {