diff --git a/api/current.txt b/api/current.txt
index f2081dbc5b5ae..e8015ad38d1e3 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -45667,8 +45667,7 @@ package android.webkit {
     method public void onReceivedSslError(android.webkit.WebView, android.webkit.SslErrorHandler, android.net.http.SslError);
     method public void onScaleChanged(android.webkit.WebView, float, float);
     method public deprecated void onTooManyRedirects(android.webkit.WebView, android.os.Message, android.os.Message);
-    method public void onUnhandledInputEvent(android.webkit.WebView, android.view.InputEvent);
-    method public deprecated void onUnhandledKeyEvent(android.webkit.WebView, android.view.KeyEvent);
+    method public void onUnhandledKeyEvent(android.webkit.WebView, android.view.KeyEvent);
     method public deprecated android.webkit.WebResourceResponse shouldInterceptRequest(android.webkit.WebView, java.lang.String);
     method public android.webkit.WebResourceResponse shouldInterceptRequest(android.webkit.WebView, android.webkit.WebResourceRequest);
     method public boolean shouldOverrideKeyEvent(android.webkit.WebView, android.view.KeyEvent);
diff --git a/api/removed.txt b/api/removed.txt
index 0db555f9f1022..a1602184ddbe8 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -466,6 +466,14 @@ package android.view {
 
 }
 
+package android.webkit {
+
+  public class WebViewClient {
+    method public void onUnhandledInputEvent(android.webkit.WebView, android.view.InputEvent);
+  }
+
+}
+
 package android.widget {
 
   public class TextView extends android.view.View implements android.view.ViewTreeObserver.OnPreDrawListener {
diff --git a/api/system-current.txt b/api/system-current.txt
index 26f62fcc3def4..1fc24b37d86e7 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -48789,8 +48789,7 @@ package android.webkit {
     method public void onReceivedSslError(android.webkit.WebView, android.webkit.SslErrorHandler, android.net.http.SslError);
     method public void onScaleChanged(android.webkit.WebView, float, float);
     method public deprecated void onTooManyRedirects(android.webkit.WebView, android.os.Message, android.os.Message);
-    method public void onUnhandledInputEvent(android.webkit.WebView, android.view.InputEvent);
-    method public deprecated void onUnhandledKeyEvent(android.webkit.WebView, android.view.KeyEvent);
+    method public void onUnhandledKeyEvent(android.webkit.WebView, android.view.KeyEvent);
     method public deprecated android.webkit.WebResourceResponse shouldInterceptRequest(android.webkit.WebView, java.lang.String);
     method public android.webkit.WebResourceResponse shouldInterceptRequest(android.webkit.WebView, android.webkit.WebResourceRequest);
     method public boolean shouldOverrideKeyEvent(android.webkit.WebView, android.view.KeyEvent);
diff --git a/api/system-removed.txt b/api/system-removed.txt
index 5f9d3502fb015..3f2613ed17f3f 100644
--- a/api/system-removed.txt
+++ b/api/system-removed.txt
@@ -464,6 +464,14 @@ package android.view {
 
 }
 
+package android.webkit {
+
+  public class WebViewClient {
+    method public void onUnhandledInputEvent(android.webkit.WebView, android.view.InputEvent);
+  }
+
+}
+
 package android.widget {
 
   public class TextView extends android.view.View implements android.view.ViewTreeObserver.OnPreDrawListener {
diff --git a/api/test-current.txt b/api/test-current.txt
index 5971f313594e8..7140f5bef916c 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -45745,8 +45745,7 @@ package android.webkit {
     method public void onReceivedSslError(android.webkit.WebView, android.webkit.SslErrorHandler, android.net.http.SslError);
     method public void onScaleChanged(android.webkit.WebView, float, float);
     method public deprecated void onTooManyRedirects(android.webkit.WebView, android.os.Message, android.os.Message);
-    method public void onUnhandledInputEvent(android.webkit.WebView, android.view.InputEvent);
-    method public deprecated void onUnhandledKeyEvent(android.webkit.WebView, android.view.KeyEvent);
+    method public void onUnhandledKeyEvent(android.webkit.WebView, android.view.KeyEvent);
     method public deprecated android.webkit.WebResourceResponse shouldInterceptRequest(android.webkit.WebView, java.lang.String);
     method public android.webkit.WebResourceResponse shouldInterceptRequest(android.webkit.WebView, android.webkit.WebResourceRequest);
     method public boolean shouldOverrideKeyEvent(android.webkit.WebView, android.view.KeyEvent);
diff --git a/api/test-removed.txt b/api/test-removed.txt
index 0db555f9f1022..a1602184ddbe8 100644
--- a/api/test-removed.txt
+++ b/api/test-removed.txt
@@ -466,6 +466,14 @@ package android.view {
 
 }
 
+package android.webkit {
+
+  public class WebViewClient {
+    method public void onUnhandledInputEvent(android.webkit.WebView, android.view.InputEvent);
+  }
+
+}
+
 package android.widget {
 
   public class TextView extends android.view.View implements android.view.ViewTreeObserver.OnPreDrawListener {
diff --git a/core/java/android/webkit/WebViewClient.java b/core/java/android/webkit/WebViewClient.java
index 8318656342d76..76d3fb15d0496 100644
--- a/core/java/android/webkit/WebViewClient.java
+++ b/core/java/android/webkit/WebViewClient.java
@@ -403,9 +403,7 @@ public class WebViewClient {
      *
      * @param view The WebView that is initiating the callback.
      * @param event The key event.
-     * @deprecated This method is subsumed by the more generic onUnhandledInputEvent.
      */
-    @Deprecated
     public void onUnhandledKeyEvent(WebView view, KeyEvent event) {
         onUnhandledInputEventInternal(view, event);
     }
@@ -427,6 +425,7 @@ public class WebViewClient {
      *
      * @param view The WebView that is initiating the callback.
      * @param event The input event.
+     * @removed
      */
     public void onUnhandledInputEvent(WebView view, InputEvent event) {
         if (event instanceof KeyEvent) {