diff options
| author | Jesse Wilson <jessewilson@google.com> | 2010-11-09 10:26:39 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-09 10:26:39 -0800 |
| commit | 762b33f9494ba48aa1be3701d345b692e8432af9 (patch) | |
| tree | 6e9e5df5a855f0ebc92376740672c00bc0f68e64 | |
| parent | 385125c65452b7e7e9305ec09e3db721474bb5c3 (diff) | |
| parent | 2d2f10fa3412adc07a08c25ba5d2df600fb654bf (diff) | |
| download | frameworks_base-762b33f9494ba48aa1be3701d345b692e8432af9.zip frameworks_base-762b33f9494ba48aa1be3701d345b692e8432af9.tar.gz frameworks_base-762b33f9494ba48aa1be3701d345b692e8432af9.tar.bz2 | |
am 2d2f10fa: am 28c74257: Add @Deprecated to match @deprecated where it\'s missing.
* commit '2d2f10fa3412adc07a08c25ba5d2df600fb654bf':
Add @Deprecated to match @deprecated where it's missing.
| -rw-r--r-- | api/current.xml | 2 | ||||
| -rw-r--r-- | core/java/android/net/SSLCertificateSocketFactory.java | 1 | ||||
| -rw-r--r-- | core/java/android/net/http/SslCertificate.java | 3 | ||||
| -rw-r--r-- | core/java/android/util/EventLogTags.java | 1 |
4 files changed, 6 insertions, 1 deletions
diff --git a/api/current.xml b/api/current.xml index 99c62a8..3595157 100644 --- a/api/current.xml +++ b/api/current.xml @@ -234335,7 +234335,7 @@ synchronized="false" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </method> diff --git a/core/java/android/net/SSLCertificateSocketFactory.java b/core/java/android/net/SSLCertificateSocketFactory.java index b8a1113..f8f8a29 100644 --- a/core/java/android/net/SSLCertificateSocketFactory.java +++ b/core/java/android/net/SSLCertificateSocketFactory.java @@ -99,6 +99,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { private final boolean mSecure; /** @deprecated Use {@link #getDefault(int)} instead. */ + @Deprecated public SSLCertificateSocketFactory(int handshakeTimeoutMillis) { this(handshakeTimeoutMillis, null, true); } diff --git a/core/java/android/net/http/SslCertificate.java b/core/java/android/net/http/SslCertificate.java index c29926c..30f25a2 100644 --- a/core/java/android/net/http/SslCertificate.java +++ b/core/java/android/net/http/SslCertificate.java @@ -112,6 +112,7 @@ public class SslCertificate { * @param validNotAfter The not-after date from the certificate validity period in ISO 8601 format * @deprecated Use {@link #SslCertificate(String, String, Date, Date)} */ + @Deprecated public SslCertificate( String issuedTo, String issuedBy, String validNotBefore, String validNotAfter) { this(issuedTo, issuedBy, parseDate(validNotBefore), parseDate(validNotAfter)); @@ -157,6 +158,7 @@ public class SslCertificate { * * @deprecated Use {@link #getValidNotBeforeDate()} */ + @Deprecated public String getValidNotBefore() { return formatDate(mValidNotBefore); } @@ -175,6 +177,7 @@ public class SslCertificate { * * @deprecated Use {@link #getValidNotAfterDate()} */ + @Deprecated public String getValidNotAfter() { return formatDate(mValidNotAfter); } diff --git a/core/java/android/util/EventLogTags.java b/core/java/android/util/EventLogTags.java index 5cf5332..8c18417 100644 --- a/core/java/android/util/EventLogTags.java +++ b/core/java/android/util/EventLogTags.java @@ -29,6 +29,7 @@ import java.util.regex.Pattern; * @deprecated This class is no longer functional. * Use {@link android.util.EventLog} instead. */ +@Deprecated public class EventLogTags { public static class Description { public final int mTag; |