Merge changes from topics "setter_getter_fix", "use_header_block" am: ba0f26fb86
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2475248
Change-Id: Id0f86d2e456a732caee18d9298c8647d9b440af3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 e82b24d..9d40e43 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
@@ -26,6 +26,7 @@
import static org.junit.Assume.assumeTrue;
import android.net.http.BidirectionalStream;
+import android.net.http.HeaderBlock;
import android.net.http.HttpException;
import android.net.http.UrlResponseInfo;
import android.os.ConditionVariable;
@@ -56,7 +57,7 @@
public int mHttpResponseDataLength;
public String mResponseAsString = "";
- public UrlResponseInfo.HeaderBlock mTrailers;
+ public HeaderBlock mTrailers;
private static final int READ_BUFFER_SIZE = 32 * 1024;
@@ -337,7 +338,7 @@
public void onResponseTrailersReceived(
BidirectionalStream stream,
UrlResponseInfo info,
- UrlResponseInfo.HeaderBlock trailers) {
+ HeaderBlock trailers) {
checkOnValidThread();
assertFalse(stream.isDone());
assertNull(mError);
diff --git a/Tethering/common/TetheringLib/cronet_enabled/api/current.txt b/Tethering/common/TetheringLib/cronet_enabled/api/current.txt
index 23ab3cf..98d02c3 100644
--- a/Tethering/common/TetheringLib/cronet_enabled/api/current.txt
+++ b/Tethering/common/TetheringLib/cronet_enabled/api/current.txt
@@ -5,7 +5,7 @@
ctor public BidirectionalStream();
method public abstract void cancel();
method public abstract void flush();
- method @NonNull public abstract java.util.List<java.util.Map.Entry<java.lang.String,java.lang.String>> getHeaders();
+ method @NonNull public abstract android.net.http.HeaderBlock getHeaders();
method @NonNull public abstract String getHttpMethod();
method public abstract int getPriority();
method public abstract int getTrafficStatsTag();
@@ -41,7 +41,7 @@
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 onResponseTrailersReceived(@NonNull android.net.http.BidirectionalStream, @NonNull android.net.http.UrlResponseInfo, @NonNull android.net.http.UrlResponseInfo.HeaderBlock);
+ 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);
@@ -107,6 +107,12 @@
method @NonNull public android.net.http.DnsOptions.StaleDnsOptions.Builder setUseStaleOnNameNotResolvedEnabled(int);
}
+ public abstract class HeaderBlock {
+ ctor public HeaderBlock();
+ method @NonNull public abstract java.util.List<java.util.Map.Entry<java.lang.String,java.lang.String>> getAsList();
+ method @NonNull public abstract java.util.Map<java.lang.String,java.util.List<java.lang.String>> getAsMap();
+ }
+
public abstract class HttpEngine {
method public void bindToNetwork(@Nullable android.net.Network);
method @NonNull public abstract java.net.URLStreamHandlerFactory createUrlStreamHandlerFactory();
@@ -204,7 +210,7 @@
public abstract class UrlRequest {
method public abstract void cancel();
method public abstract void followRedirect();
- method @NonNull public abstract java.util.List<java.util.Map.Entry<java.lang.String,java.lang.String>> getHeaders();
+ method @NonNull public abstract android.net.http.HeaderBlock getHeaders();
method @Nullable public abstract String getHttpMethod();
method public abstract int getPriority();
method public abstract void getStatus(@NonNull android.net.http.UrlRequest.StatusListener);
@@ -272,7 +278,7 @@
public abstract class UrlResponseInfo {
ctor public UrlResponseInfo();
- method @NonNull public abstract android.net.http.UrlResponseInfo.HeaderBlock getHeaders();
+ method @NonNull public abstract android.net.http.HeaderBlock getHeaders();
method public abstract int getHttpStatusCode();
method @NonNull public abstract String getHttpStatusText();
method @NonNull public abstract String getNegotiatedProtocol();
@@ -282,11 +288,5 @@
method public abstract boolean wasCached();
}
- public abstract static class UrlResponseInfo.HeaderBlock {
- ctor public UrlResponseInfo.HeaderBlock();
- method @NonNull public abstract java.util.List<java.util.Map.Entry<java.lang.String,java.lang.String>> getAsList();
- method @NonNull public abstract java.util.Map<java.lang.String,java.util.List<java.lang.String>> getAsMap();
- }
-
}