diff options
| author | Paul Duffin <paulduffin@google.com> | 2023-10-12 14:58:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-12 14:58:00 +0000 |
| commit | d36200aded803807c60b9fb2459eb5c38cca93ce (patch) | |
| tree | 3730e8e911c314cc7a8d562fdab0fd319756daa5 | |
| parent | cdcabb3dc6f841eed7b179c76b2bdc69e5d60c9c (diff) | |
| parent | ad549fec3423ec19548eed2d71d0f796081862f6 (diff) | |
| download | apache-http-d36200aded803807c60b9fb2459eb5c38cca93ce.tar.gz | |
Merge "Add additional overriding methods to signature files" into main am: ea1cd97bae am: f9ac939eff am: ad549fec34
Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2784259
Change-Id: I5f2af7ee8a4bf3637f425d616d4995310b4c7e09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | api/current.txt | 8 | ||||
| -rw-r--r-- | api/removed.txt | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index a6f3a96..30104c9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -1,6 +1,4 @@ // Signature format: 2.0 -// - add-additional-overrides=no -// - migrating=Migration in progress see b/299366704 package android.net.compatibility { public class WebAddress { @@ -1229,7 +1227,10 @@ package org.apache.http.auth { @Deprecated public final class BasicUserPrincipal implements java.security.Principal { ctor @Deprecated public BasicUserPrincipal(String); + method @Deprecated public boolean equals(Object); method @Deprecated public String getName(); + method @Deprecated public int hashCode(); + method @Deprecated public String toString(); } @Deprecated public interface Credentials { @@ -1261,9 +1262,12 @@ package org.apache.http.auth { @Deprecated public class NTUserPrincipal implements java.security.Principal { ctor @Deprecated public NTUserPrincipal(String, String); + method @Deprecated public boolean equals(Object); method @Deprecated public String getDomain(); method @Deprecated public String getName(); method @Deprecated public String getUsername(); + method @Deprecated public int hashCode(); + method @Deprecated public String toString(); } @Deprecated public class UsernamePasswordCredentials implements org.apache.http.auth.Credentials { diff --git a/api/removed.txt b/api/removed.txt index 14191eb..d802177 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -1,3 +1 @@ // Signature format: 2.0 -// - add-additional-overrides=no -// - migrating=Migration in progress see b/299366704 |