diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-01-11 09:26:04 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-01-11 09:26:04 +0000 |
commit | 764f0c43edbf2e77f94d269db22b75c311c328d7 (patch) | |
tree | fbcebadcaa4bc5d36544764250eca5e341e4441f | |
parent | 615a027e92a610f05e62e4228091a8a9c965bf5a (diff) | |
parent | 7ac610fce400cba7133b618844e038f32c987fd5 (diff) | |
download | apache-http-764f0c43edbf2e77f94d269db22b75c311c328d7.tar.gz |
Snap for 4539010 from 7ac610fce400cba7133b618844e038f32c987fd5 to pi-release
Change-Id: Ida711df6c1530475fd68781db2618ecfcce0c508
-rw-r--r-- | Android.mk | 1 | ||||
-rw-r--r-- | api/apache-http-legacy-current.txt | 3 |
2 files changed, 2 insertions, 2 deletions
@@ -116,6 +116,7 @@ APACHE_HTTP_LEGACY_REMOVED_API_FILE := $(LOCAL_PATH)/api/apache-http-legacy-remo LOCAL_DROIDDOC_OPTIONS:= \ -stubpackages $(subst $(space),:,$(apache_http_packages)) \ + -hidePackage com.android.okhttp \ -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/org.apache.http.legacy_intermediates/src \ -nodocs \ -api $(APACHE_HTTP_LEGACY_OUTPUT_API_FILE) \ diff --git a/api/apache-http-legacy-current.txt b/api/apache-http-legacy-current.txt index dfc7fcd..0b3f127 100644 --- a/api/apache-http-legacy-current.txt +++ b/api/apache-http-legacy-current.txt @@ -216,12 +216,11 @@ package android.net.http { field public static final int UNKNOWN = 0; // 0x0 } - public final class HttpResponseCache extends java.net.ResponseCache implements java.io.Closeable com.android.okhttp.OkCacheContainer { + public final class HttpResponseCache extends java.net.ResponseCache implements java.io.Closeable { method public void close() throws java.io.IOException; method public void delete() throws java.io.IOException; method public void flush(); method public java.net.CacheResponse get(java.net.URI, java.lang.String, java.util.Map<java.lang.String, java.util.List<java.lang.String>>) throws java.io.IOException; - method public com.android.okhttp.Cache getCache(); method public int getHitCount(); method public static android.net.http.HttpResponseCache getInstalled(); method public int getNetworkCount(); |