diff --git a/api/current.txt b/api/current.txt
index 794f0b268d2d7..aba97936a47d5 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28043,11 +28043,11 @@ package android.webkit {
   public class WebViewDatabase {
     method public void clearFormData();
     method public void clearHttpAuthUsernamePassword();
-    method public void clearUsernamePassword();
+    method public deprecated void clearUsernamePassword();
     method public static android.webkit.WebViewDatabase getInstance(android.content.Context);
     method public boolean hasFormData();
     method public boolean hasHttpAuthUsernamePassword();
-    method public boolean hasUsernamePassword();
+    method public deprecated boolean hasUsernamePassword();
   }
 
   public class WebViewFragment extends android.app.Fragment {
diff --git a/core/java/android/webkit/WebViewDatabase.java b/core/java/android/webkit/WebViewDatabase.java
index e08052a379185..99e0ffb241713 100644
--- a/core/java/android/webkit/WebViewDatabase.java
+++ b/core/java/android/webkit/WebViewDatabase.java
@@ -50,8 +50,10 @@ public class WebViewDatabase {
      *
      * @return true if there are any saved username/password pairs
      * @see WebView#savePassword
-     * @see #clearUsernamePassword
+     * @see #clearUsernamePassworda
+     * @deprecated Saving passwords in WebView will not be supported in future versions.
      */
+    @Deprecated
     public boolean hasUsernamePassword() {
         throw new MustOverrideException();
     }
@@ -62,7 +64,9 @@ public class WebViewDatabase {
      *
      * @see WebView#savePassword
      * @see #hasUsernamePassword
+     * @deprecated Saving passwords in WebView will not be supported in future versions.
      */
+    @Deprecated
     public void clearUsernamePassword() {
         throw new MustOverrideException();
     }