LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Cronet API: make UrlRequest.Callback an interface."

Browse Source
This commit is contained in:
Treehugger Robot
2023-03-14 15:42:28 +00:00
committed by Gerrit Code Review
parent 210540d3b5 fcfe8c7d8e
commit 944d6a3235
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Cronet/tests/cts/src/android/net/http/cts/UrlRequestTest.java
View File

@@ -44,6 +44,8 @@ import android.net.http.cts.util.TestUrlRequestCallback;
import android.net.http.cts.util.TestUrlRequestCallback.ResponseStep; import android.net.http.cts.util.TestUrlRequestCallback.ResponseStep;
import android.net.http.cts.util.UploadDataProviders; import android.net.http.cts.util.UploadDataProviders;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -310,7 +312,7 @@ public class UrlRequestTest {
assertThat(mCallback.mResponseAsString).isEqualTo(body); assertThat(mCallback.mResponseAsString).isEqualTo(body);
} }
private static class StubUrlRequestCallback extends UrlRequest.Callback { private static class StubUrlRequestCallback implements UrlRequest.Callback {
@Override @Override
public void onRedirectReceived( public void onRedirectReceived(
@@ -338,6 +340,11 @@ public class UrlRequestTest {
public void onFailed(UrlRequest request, UrlResponseInfo info, HttpException error) { public void onFailed(UrlRequest request, UrlResponseInfo info, HttpException error) {
throw new UnsupportedOperationException(error); throw new UnsupportedOperationException(error);
} }
@Override
public void onCanceled(@NonNull UrlRequest request, @Nullable UrlResponseInfo info) {
throw new UnsupportedOperationException();
}
} }
private static class InMemoryUploadDataProvider extends UploadDataProvider { private static class InMemoryUploadDataProvider extends UploadDataProvider {

2
Cronet/tests/cts/src/android/net/http/cts/util/TestUrlRequestCallback.java
View File

@@ -50,7 +50,7 @@ import java.util.concurrent.TimeUnit;
* method to block thread until the request completes on another thread. * method to block thread until the request completes on another thread.
* Allows us to cancel, block request or throw an exception from an arbitrary step. * Allows us to cancel, block request or throw an exception from an arbitrary step.
*/ */
public class TestUrlRequestCallback extends UrlRequest.Callback { public class TestUrlRequestCallback implements UrlRequest.Callback {
private static final int TIMEOUT_MS = 12_000; private static final int TIMEOUT_MS = 12_000;
public ArrayList<UrlResponseInfo> mRedirectResponseInfoList = new ArrayList<>(); public ArrayList<UrlResponseInfo> mRedirectResponseInfoList = new ArrayList<>();
public ArrayList<String> mRedirectUrlList = new ArrayList<>(); public ArrayList<String> mRedirectUrlList = new ArrayList<>();

13
Tethering/common/TetheringLib/cronet_enabled/api/current.txt
View File

@@ -241,14 +241,13 @@ package android.net.http {
method @NonNull public abstract android.net.http.UrlRequest.Builder setUploadDataProvider(@NonNull android.net.http.UploadDataProvider, @NonNull java.util.concurrent.Executor); method @NonNull public abstract android.net.http.UrlRequest.Builder setUploadDataProvider(@NonNull android.net.http.UploadDataProvider, @NonNull java.util.concurrent.Executor);
} }
public abstract static class UrlRequest.Callback { public static interface UrlRequest.Callback {
ctor public UrlRequest.Callback();
method public void onCanceled(@NonNull android.net.http.UrlRequest, @Nullable android.net.http.UrlResponseInfo); method public void onCanceled(@NonNull android.net.http.UrlRequest, @Nullable android.net.http.UrlResponseInfo);
method public abstract void onFailed(@NonNull android.net.http.UrlRequest, @Nullable android.net.http.UrlResponseInfo, @NonNull android.net.http.HttpException); method public void onFailed(@NonNull android.net.http.UrlRequest, @Nullable android.net.http.UrlResponseInfo, @NonNull android.net.http.HttpException);
method public abstract void onReadCompleted(@NonNull android.net.http.UrlRequest, @NonNull android.net.http.UrlResponseInfo, @NonNull java.nio.ByteBuffer) throws java.lang.Exception; method public void onReadCompleted(@NonNull android.net.http.UrlRequest, @NonNull android.net.http.UrlResponseInfo, @NonNull java.nio.ByteBuffer) throws java.lang.Exception;
method public abstract void onRedirectReceived(@NonNull android.net.http.UrlRequest, @NonNull android.net.http.UrlResponseInfo, @NonNull String) throws java.lang.Exception; method public void onRedirectReceived(@NonNull android.net.http.UrlRequest, @NonNull android.net.http.UrlResponseInfo, @NonNull String) throws java.lang.Exception;
method public abstract void onResponseStarted(@NonNull android.net.http.UrlRequest, @NonNull android.net.http.UrlResponseInfo) throws java.lang.Exception; method public void onResponseStarted(@NonNull android.net.http.UrlRequest, @NonNull android.net.http.UrlResponseInfo) throws java.lang.Exception;
method public abstract void onSucceeded(@NonNull android.net.http.UrlRequest, @NonNull android.net.http.UrlResponseInfo); method public void onSucceeded(@NonNull android.net.http.UrlRequest, @NonNull android.net.http.UrlResponseInfo);
} }
public static class UrlRequest.Status { public static class UrlRequest.Status {