Merge "Clean remaining API related issues." into mnc-dev

4 files changed, 2 insertions, 37 deletions

diff --git a/core/java/android/webkit/WebResourceError.java b/core/java/android/webkit/WebResourceError.java
index 90693f373e1b..11f1b6f17566 100644
--- a/core/java/android/webkit/WebResourceError.java
+++ b/core/java/android/webkit/WebResourceError.java
@@ -36,11 +36,8 @@ public abstract class WebResourceError {
      * and thus can be used for communicating the problem to the user.
      *
      * @return The description of the error
-     *
-     * Will become abstract after updated WebView.apk will be submitted
-     * into the Android tree.
      */
-    public CharSequence getDescription() { return ""; }
+    public abstract CharSequence getDescription();
 
     /**
      * This class can not be subclassed by applications.
diff --git a/core/java/android/webkit/WebResourceResponse.java b/core/java/android/webkit/WebResourceResponse.java
index 3a925c8dc826..80c43c147dbe 100644
--- a/core/java/android/webkit/WebResourceResponse.java
+++ b/core/java/android/webkit/WebResourceResponse.java
@@ -27,7 +27,7 @@ import android.annotation.SystemApi;
  * class from {@link WebViewClient#shouldInterceptRequest} to provide a custom
  * response when the WebView requests a particular resource.
  */
-public class WebResourceResponse extends WebResourceResponseBase {
+public class WebResourceResponse {
     private boolean mImmutable;
     private String mMimeType;
     private String mEncoding;
diff --git a/core/java/android/webkit/WebResourceResponseBase.java b/core/java/android/webkit/WebResourceResponseBase.java
deleted file mode 100644
index 69eb3974699b..000000000000
--- a/core/java/android/webkit/WebResourceResponseBase.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.webkit;
-
-/**
- * This class will be deleted after updated WebView.apk will be submitted
- * into the Android tree.
- */
-public abstract class WebResourceResponseBase {
-}
diff --git a/core/java/android/webkit/WebViewClient.java b/core/java/android/webkit/WebViewClient.java
index feed2b8f22bf..2f5c9e2d2d45 100644
--- a/core/java/android/webkit/WebViewClient.java
+++ b/core/java/android/webkit/WebViewClient.java
@@ -239,14 +239,6 @@ public class WebViewClient {
     }
 
     /**
-     * This method will be deleted after updated WebView.apk will be submitted
-     * into the Android tree.
-     */
-    public void onReceivedHttpError(
-            WebView view, WebResourceRequest request, WebResourceResponseBase errorResponse) {
-    }
-
-    /**
      * Notify the host application that an HTTP error has been received from the server while
      * loading a resource.  HTTP errors have status codes >= 400.  This callback will be called
      * for any resource (iframe, image, etc), not just for the main page. Thus, it is recommended to