diff options
author | Jesse Wilson <jessewilson@google.com> | 2010-11-04 14:09:18 -0700 |
---|---|---|
committer | Jesse Wilson <jessewilson@google.com> | 2010-11-09 10:10:11 -0800 |
commit | 28c742573ccaeb55c16bc02fb25fdd86b8d1f76a (patch) | |
tree | 04b5c7321183c1353495fa294c2f605256762c8c /core | |
parent | 9eb48bb2b1627ef8182d260f8b3fd080c57bed4d (diff) | |
download | frameworks_base-28c742573ccaeb55c16bc02fb25fdd86b8d1f76a.zip frameworks_base-28c742573ccaeb55c16bc02fb25fdd86b8d1f76a.tar.gz frameworks_base-28c742573ccaeb55c16bc02fb25fdd86b8d1f76a.tar.bz2 |
Add @Deprecated to match @deprecated where it's missing.
Change-Id: Ice95022671968386a601f32df7850f9baa1d2dd0
Diffstat (limited to 'core')
-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 | ||||
-rw-r--r-- | core/java/android/webkit/WebSettings.java | 2 | ||||
-rw-r--r-- | core/java/android/webkit/WebViewClient.java | 1 | ||||
-rw-r--r-- | core/java/android/widget/ListView.java | 1 |
6 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/net/SSLCertificateSocketFactory.java b/core/java/android/net/SSLCertificateSocketFactory.java index b822b27..63ac21f 100644 --- a/core/java/android/net/SSLCertificateSocketFactory.java +++ b/core/java/android/net/SSLCertificateSocketFactory.java @@ -102,6 +102,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; diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index da0c61b..4d70e7c 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -1029,6 +1029,7 @@ public class WebSettings { * @deprecated This method has been deprecated in favor of * {@link #setPluginState} */ + @Deprecated public synchronized void setPluginsEnabled(boolean flag) { setPluginState(PluginState.ON); } @@ -1211,6 +1212,7 @@ public class WebSettings { * @return True if plugins are enabled. * @deprecated This method has been replaced by {@link #getPluginState} */ + @Deprecated public synchronized boolean getPluginsEnabled() { return mPluginState == PluginState.ON; } diff --git a/core/java/android/webkit/WebViewClient.java b/core/java/android/webkit/WebViewClient.java index 02c7210..1f8eeba 100644 --- a/core/java/android/webkit/WebViewClient.java +++ b/core/java/android/webkit/WebViewClient.java @@ -89,6 +89,7 @@ public class WebViewClient { * @deprecated This method is no longer called. When the WebView encounters * a redirect loop, it will cancel the load. */ + @Deprecated public void onTooManyRedirects(WebView view, Message cancelMsg, Message continueMsg) { cancelMsg.sendToTarget(); diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java index 82b7c4f..e1a1894 100644 --- a/core/java/android/widget/ListView.java +++ b/core/java/android/widget/ListView.java @@ -3626,6 +3626,7 @@ public class ListView extends AbsListView { * * @deprecated Use {@link #getCheckedItemIds()} instead. */ + @Deprecated public long[] getCheckItemIds() { // Use new behavior that correctly handles stable ID mapping. if (mAdapter != null && mAdapter.hasStableIds()) { |