Clean remaining API related issues. (98fe09cb) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −7

Original line number	Diff line number	Diff line
		@@ -38799,7 +38799,7 @@ package android.webkit {
		}

		public abstract class WebResourceError {
		method public java.lang.CharSequence getDescription();
		method public abstract java.lang.CharSequence getDescription();
		method public abstract int getErrorCode();
		}

		@@ -38811,7 +38811,7 @@ package android.webkit {
		method public abstract boolean isForMainFrame();
		}

		public class WebResourceResponse extends android.webkit.WebResourceResponseBase {
		public class WebResourceResponse {
		ctor public WebResourceResponse(java.lang.String, java.lang.String, java.io.InputStream);
		ctor public WebResourceResponse(java.lang.String, java.lang.String, int, java.lang.String, java.util.Map<java.lang.String, java.lang.String>, java.io.InputStream);
		method public java.io.InputStream getData();
		@@ -38827,10 +38827,6 @@ package android.webkit {
		method public void setStatusCodeAndReasonPhrase(int, java.lang.String);
		}

		public abstract class WebResourceResponseBase {
		ctor public WebResourceResponseBase();
		}

		public abstract class WebSettings {
		ctor public WebSettings();
		method public abstract deprecated boolean enableSmoothTransition();
		@@ -39159,7 +39155,6 @@ package android.webkit {
		method public deprecated void onReceivedError(android.webkit.WebView, int, java.lang.String, java.lang.String);
		method public void onReceivedError(android.webkit.WebView, android.webkit.WebResourceRequest, android.webkit.WebResourceError);
		method public void onReceivedHttpAuthRequest(android.webkit.WebView, android.webkit.HttpAuthHandler, java.lang.String, java.lang.String);
		method public void onReceivedHttpError(android.webkit.WebView, android.webkit.WebResourceRequest, android.webkit.WebResourceResponseBase);
		method public void onReceivedHttpError(android.webkit.WebView, android.webkit.WebResourceRequest, android.webkit.WebResourceResponse);
		method public void onReceivedLoginRequest(android.webkit.WebView, java.lang.String, java.lang.String, java.lang.String);
		method public void onReceivedSslError(android.webkit.WebView, android.webkit.SslErrorHandler, android.net.http.SslError);

api/system-current.txt

+2 −7

Original line number	Diff line number	Diff line
		@@ -41124,7 +41124,7 @@ package android.webkit {

		public abstract class WebResourceError {
		ctor public WebResourceError();
		method public java.lang.CharSequence getDescription();
		method public abstract java.lang.CharSequence getDescription();
		method public abstract int getErrorCode();
		}

		@@ -41136,7 +41136,7 @@ package android.webkit {
		method public abstract boolean isForMainFrame();
		}

		public class WebResourceResponse extends android.webkit.WebResourceResponseBase {
		public class WebResourceResponse {
		ctor public WebResourceResponse(java.lang.String, java.lang.String, java.io.InputStream);
		ctor public WebResourceResponse(java.lang.String, java.lang.String, int, java.lang.String, java.util.Map<java.lang.String, java.lang.String>, java.io.InputStream);
		ctor public WebResourceResponse(boolean, java.lang.String, java.lang.String, int, java.lang.String, java.util.Map<java.lang.String, java.lang.String>, java.io.InputStream);
		@@ -41153,10 +41153,6 @@ package android.webkit {
		method public void setStatusCodeAndReasonPhrase(int, java.lang.String);
		}

		public abstract class WebResourceResponseBase {
		ctor public WebResourceResponseBase();
		}

		public abstract class WebSettings {
		ctor public WebSettings();
		method public abstract deprecated boolean enableSmoothTransition();
		@@ -41530,7 +41526,6 @@ package android.webkit {
		method public deprecated void onReceivedError(android.webkit.WebView, int, java.lang.String, java.lang.String);
		method public void onReceivedError(android.webkit.WebView, android.webkit.WebResourceRequest, android.webkit.WebResourceError);
		method public void onReceivedHttpAuthRequest(android.webkit.WebView, android.webkit.HttpAuthHandler, java.lang.String, java.lang.String);
		method public void onReceivedHttpError(android.webkit.WebView, android.webkit.WebResourceRequest, android.webkit.WebResourceResponseBase);
		method public void onReceivedHttpError(android.webkit.WebView, android.webkit.WebResourceRequest, android.webkit.WebResourceResponse);
		method public void onReceivedLoginRequest(android.webkit.WebView, java.lang.String, java.lang.String, java.lang.String);
		method public void onReceivedSslError(android.webkit.WebView, android.webkit.SslErrorHandler, android.net.http.SslError);

core/java/android/webkit/WebResourceError.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -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.

core/java/android/webkit/WebResourceResponse.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

core/java/android/webkit/WebResourceResponseBase.java

deleted100644 → 0

+0 −24

Original line number	Diff line number	Diff line
		/*
		* 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 {
		}