Merge "Add additional overriding methods to signature files" into main am: ea1cd97bae am: f9ac939eff am: ad549fec34 am: d36200aded
Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2784259
Change-Id: Ifef7092644b8f4d36b389ab5dc0935b06aaf2f47
Signed-off-by: Automerger Merge Worker <[email protected]>
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 @@
@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 @@
@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
