Merge "WebView: wrap Java literals with {@code}" (48c7a7b1) · Commits · e / os / android_frameworks_base

core/java/android/webkit/CacheManager.java

+11 −11

Original line number	Diff line number	Diff line
		@@ -230,7 +230,7 @@ public final class CacheManager {
		* {@link CacheManager.CacheResult#getLocalPath CacheManager.CacheResult.getLocalPath()}.
		*
		* @return the base directory of the cache
		* @deprecated This method no longer has any effect and always returns null.
		* @deprecated This method no longer has any effect and always returns {@code null}.
		*/
		@Deprecated
		public static File getCacheFileBaseDir() {
		@@ -240,8 +240,8 @@ public final class CacheManager {
		/**
		* Gets whether the HTTP cache is disabled.
		*
		* @return true if the HTTP cache is disabled
		* @deprecated This method no longer has any effect and always returns false.
		* @return {@code true} if the HTTP cache is disabled
		* @deprecated This method no longer has any effect and always returns {@code false}.
		*/
		@Deprecated
		public static boolean cacheDisabled() {
		@@ -249,12 +249,12 @@ public final class CacheManager {
		}

		/**
		* Starts a cache transaction. Returns true if this is the only running
		* Starts a cache transaction. Returns {@code true} if this is the only running
		* transaction. Otherwise, this transaction is nested inside currently
		* running transactions and false is returned.
		* running transactions and {@code false} is returned.
		*
		* @return true if this is the only running transaction
		* @deprecated This method no longer has any effect and always returns false.
		* @return {@code true} if this is the only running transaction
		* @deprecated This method no longer has any effect and always returns {@code false}.
		*/
		@Deprecated
		public static boolean startCacheTransaction() {
		@@ -265,8 +265,8 @@ public final class CacheManager {
		* Ends the innermost cache transaction and returns whether this was the
		* only running transaction.
		*
		* @return true if this was the only running transaction
		* @deprecated This method no longer has any effect and always returns false.
		* @return {@code true} if this was the only running transaction
		* @deprecated This method no longer has any effect and always returns {@code false}.
		*/
		@Deprecated
		public static boolean endCacheTransaction() {
		@@ -274,7 +274,7 @@ public final class CacheManager {
		}

		/**
		* Gets the cache entry for the specified URL, or null if none is found.
		* Gets the cache entry for the specified URL, or {@code null} if none is found.
		* If a non-null value is provided for the HTTP headers map, and the cache
		* entry needs validation, appropriate headers will be added to the map.
		* The input stream of the CacheEntry object should be closed by the caller
		@@ -284,7 +284,7 @@ public final class CacheManager {
		* @param headers a map from HTTP header name to value, to be populated
		* for the returned cache entry
		* @return the cache entry for the specified URL
		* @deprecated This method no longer has any effect and always returns null.
		* @deprecated This method no longer has any effect and always returns {@code null}.
		*/
		@Deprecated
		public static CacheResult getCacheFile(String url,

core/java/android/webkit/ClientCertRequest.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -42,13 +42,13 @@ public abstract class ClientCertRequest {
		public ClientCertRequest() { }

		/**
		* Returns the acceptable types of asymmetric keys (can be null).
		* Returns the acceptable types of asymmetric keys (can be {@code null}).
		*/
		public abstract String[] getKeyTypes();

		/**
		* Returns the acceptable certificate issuers for the certificate
		* matching the private key (can be null).
		* matching the private key (can be {@code null}).
		*/
		public abstract Principal[] getPrincipals();

core/java/android/webkit/CookieManager.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -42,9 +42,9 @@ public abstract class CookieManager {
		/**
		* Sets whether the application's {@link WebView} instances should send and
		* accept cookies.
		* By default this is set to true and the WebView accepts cookies.
		* By default this is set to {@code true} and the WebView accepts cookies.
		* <p>
		* When this is true
		* When this is {@code true}
		* {@link CookieManager#setAcceptThirdPartyCookies setAcceptThirdPartyCookies} and
		* {@link CookieManager#setAcceptFileSchemeCookies setAcceptFileSchemeCookies}
		* can be used to control the policy for those specific types of cookie.
		@@ -58,7 +58,7 @@ public abstract class CookieManager {
		* Gets whether the application's {@link WebView} instances send and accept
		* cookies.
		*
		* @return true if {@link WebView} instances send and accept cookies
		* @return {@code true} if {@link WebView} instances send and accept cookies
		*/
		public abstract boolean acceptCookie();

		@@ -82,7 +82,7 @@ public abstract class CookieManager {
		* Gets whether the {@link WebView} should allow third party cookies to be set.
		*
		* @param webview the {@link WebView} instance to get the cookie policy for
		* @return true if the {@link WebView} accepts third party cookies
		* @return {@code true} if the {@link WebView} accepts third party cookies
		*/
		public abstract boolean acceptThirdPartyCookies(WebView webview);

		@@ -202,7 +202,7 @@ public abstract class CookieManager {
		/**
		* Gets whether there are stored cookies.
		*
		* @return true if there are stored cookies
		* @return {@code true} if there are stored cookies
		*/
		public abstract boolean hasCookies();

		@@ -233,7 +233,7 @@ public abstract class CookieManager {
		* Gets whether the application's {@link WebView} instances send and accept
		* cookies for file scheme URLs.
		*
		* @return true if {@link WebView} instances send and accept cookies for
		* @return {@code true} if {@link WebView} instances send and accept cookies for
		* file scheme URLs
		*/
		// Static for backward compatibility.

core/java/android/webkit/FindActionModeCallback.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -109,8 +109,8 @@ public class FindActionModeCallback implements ActionMode.Callback, TextWatcher,

		/*
		* Move the highlight to the next match.
		* @param next If true, find the next match further down in the document.
		* If false, find the previous match, up in the document.
		* @param next If {@code true}, find the next match further down in the document.
		* If {@code false}, find the previous match, up in the document.
		*/
		private void findNext(boolean next) {
		if (mWebView == null) {

core/java/android/webkit/MimeTypeMap.java

+10 −8

Original line number	Diff line number	Diff line
		@@ -17,9 +17,11 @@
		package android.webkit;

		import android.text.TextUtils;
		import java.util.regex.Pattern;

		import libcore.net.MimeUtils;

		import java.util.regex.Pattern;

		/**
		* Two-way map that maps MIME-types to file extensions and vice versa.
		*
		@@ -71,9 +73,9 @@ public class MimeTypeMap {
		}

		/**
		* Return true if the given MIME type has an entry in the map.
		* Return {@code true} if the given MIME type has an entry in the map.
		* @param mimeType A MIME type (i.e. text/plain)
		* @return True iff there is a mimeType entry in the map.
		* @return {@code true} iff there is a mimeType entry in the map.
		*/
		public boolean hasMimeType(String mimeType) {
		return MimeUtils.hasMimeType(mimeType);
		@@ -82,7 +84,7 @@ public class MimeTypeMap {
		/**
		* Return the MIME type for the given extension.
		* @param extension A file extension without the leading '.'
		* @return The MIME type for the given extension or null iff there is none.
		* @return The MIME type for the given extension or {@code null} iff there is none.
		*/
		public String getMimeTypeFromExtension(String extension) {
		return MimeUtils.guessMimeTypeFromExtension(extension);
		@@ -94,9 +96,9 @@ public class MimeTypeMap {
		}

		/**
		* Return true if the given extension has a registered MIME type.
		* Return {@code true} if the given extension has a registered MIME type.
		* @param extension A file extension without the leading '.'
		* @return True iff there is an extension entry in the map.
		* @return {@code true} iff there is an extension entry in the map.
		*/
		public boolean hasExtension(String extension) {
		return MimeUtils.hasExtension(extension);
		@@ -107,14 +109,14 @@ public class MimeTypeMap {
		* MIME types map to multiple extensions. This call will return the most
		* common extension for the given MIME type.
		* @param mimeType A MIME type (i.e. text/plain)
		* @return The extension for the given MIME type or null iff there is none.
		* @return The extension for the given MIME type or {@code null} iff there is none.
		*/
		public String getExtensionFromMimeType(String mimeType) {
		return MimeUtils.guessExtensionFromMimeType(mimeType);
		}

		/**
		* If the given MIME type is null, or one of the "generic" types (text/plain
		* If the given MIME type is {@code null}, or one of the "generic" types (text/plain
		* or application/octet-stream) map it to a type that Android can deal with.
		* If the given type is not generic, return it unchanged.
		*