Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2be201ec authored by Nate Fischer's avatar Nate Fischer
Browse files

WebView: change 'iff' to 'if' in docs 

Docs change only, no change to logic.

This replaces "iff" (if and only if) with "if". The former term is
unclear, and there's no real benefit to expanding to "if and only if."

Change-Id: I1ac26e24b816f784b6868c8860849d4118b33294
Fixes: 68133964
Test: make -j40 docs (manually verify the change looks good)
parent 670c3387

core/java/android/webkit/MimeTypeMap.java

+5 −5
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ public class MimeTypeMap { 
    }



    /**

     * Returns the file extension or an empty string iff there is no

     * Returns the file extension or an empty string if there is no

     * extension. This method is a convenience method for obtaining the

     * extension of a url and has undefined results for other Strings.

     * @param url
@@ -76,7 +76,7 @@ public class MimeTypeMap { 
    /**

     * Return {@code true} if the given MIME type has an entry in the map.

     * @param mimeType A MIME type (i.e. text/plain)

     * @return {@code true} iff there is a mimeType entry in the map.

     * @return {@code true} if there is a mimeType entry in the map.

     */

    public boolean hasMimeType(String mimeType) {

        return MimeUtils.hasMimeType(mimeType);
@@ -85,7 +85,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 {@code null} iff there is none.

     * @return The MIME type for the given extension or {@code null} if there is none.

     */

    @Nullable

    public String getMimeTypeFromExtension(String extension) {
@@ -100,7 +100,7 @@ public class MimeTypeMap { 
    /**

     * Return {@code true} if the given extension has a registered MIME type.

     * @param extension A file extension without the leading '.'

     * @return {@code true} iff there is an extension entry in the map.

     * @return {@code true} if there is an extension entry in the map.

     */

    public boolean hasExtension(String extension) {

        return MimeUtils.hasExtension(extension);
@@ -111,7 +111,7 @@ 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 {@code null} iff there is none.

     * @return The extension for the given MIME type or {@code null} if there is none.

     */

    @Nullable

    public String getExtensionFromMimeType(String mimeType) {

core/java/android/webkit/URLUtil.java

+13 −13
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ public final class URLUtil { 
    }



    /**

     * @return {@code true} iff the url is correctly URL encoded

     * @return {@code true} if the url is correctly URL encoded

     */

    static boolean verifyURLEncoding(String url) {

        int count = url.length();
@@ -171,14 +171,14 @@ public final class URLUtil { 
    }



    /**

     * @return {@code true} iff the url is an asset file.

     * @return {@code true} if the url is an asset file.

     */

    public static boolean isAssetUrl(String url) {

        return (null != url) && url.startsWith(ASSET_BASE);

    }



    /**

     * @return {@code true} iff the url is a resource file.

     * @return {@code true} if the url is a resource file.

     * @hide

     */

    public static boolean isResourceUrl(String url) {
@@ -186,7 +186,7 @@ public final class URLUtil { 
    }



    /**

     * @return {@code true} iff the url is a proxy url to allow cookieless network

     * @return {@code true} if the url is a proxy url to allow cookieless network

     * requests from a file url.

     * @deprecated Cookieless proxy is no longer supported.

     */
@@ -196,7 +196,7 @@ public final class URLUtil { 
    }



    /**

     * @return {@code true} iff the url is a local file.

     * @return {@code true} if the url is a local file.

     */

    public static boolean isFileUrl(String url) {

        return (null != url) && (url.startsWith(FILE_BASE) &&
@@ -205,28 +205,28 @@ public final class URLUtil { 
    }



    /**

     * @return {@code true} iff the url is an about: url.

     * @return {@code true} if the url is an about: url.

     */

    public static boolean isAboutUrl(String url) {

        return (null != url) && url.startsWith("about:");

    }



    /**

     * @return {@code true} iff the url is a data: url.

     * @return {@code true} if the url is a data: url.

     */

    public static boolean isDataUrl(String url) {

        return (null != url) && url.startsWith("data:");

    }



    /**

     * @return {@code true} iff the url is a javascript: url.

     * @return {@code true} if the url is a javascript: url.

     */

    public static boolean isJavaScriptUrl(String url) {

        return (null != url) && url.startsWith("javascript:");

    }



    /**

     * @return {@code true} iff the url is an http: url.

     * @return {@code true} if the url is an http: url.

     */

    public static boolean isHttpUrl(String url) {

        return (null != url) &&
@@ -235,7 +235,7 @@ public final class URLUtil { 
    }



    /**

     * @return {@code true} iff the url is an https: url.

     * @return {@code true} if the url is an https: url.

     */

    public static boolean isHttpsUrl(String url) {

        return (null != url) &&
@@ -244,7 +244,7 @@ public final class URLUtil { 
    }



    /**

     * @return {@code true} iff the url is a network url.

     * @return {@code true} if the url is a network url.

     */

    public static boolean isNetworkUrl(String url) {

        if (url == null || url.length() == 0) {
@@ -254,14 +254,14 @@ public final class URLUtil { 
    }



    /**

     * @return {@code true} iff the url is a content: url.

     * @return {@code true} if the url is a content: url.

     */

    public static boolean isContentUrl(String url) {

        return (null != url) && url.startsWith(CONTENT_BASE);

    }



    /**

     * @return {@code true} iff the url is valid.

     * @return {@code true} if the url is valid.

     */

    public static boolean isValidUrl(String url) {

        if (url == null || url.length() == 0) {

core/java/android/webkit/WebView.java

+2 −2
Original line number Diff line number Diff line
@@ -1103,7 +1103,7 @@ public class WebView extends AbsoluteLayout 
    /**

     * Gets whether this WebView has a back history item.

     *

     * @return {@code true} iff this WebView has a back history item

     * @return {@code true} if this WebView has a back history item

     */

    public boolean canGoBack() {

        checkThread();
@@ -1121,7 +1121,7 @@ public class WebView extends AbsoluteLayout 
    /**

     * Gets whether this WebView has a forward history item.

     *

     * @return {@code true} iff this WebView has a forward history item

     * @return {@code true} if this WebView has a forward history item

     */

    public boolean canGoForward() {

        checkThread();

core/java/android/webkit/WebViewFactory.java

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public final class WebViewFactory { 
    }



    /**

     * Load the native library for the given package name iff that package

     * Load the native library for the given package name if that package

     * name is the same as the one providing the webview.

     */

    public static int loadWebViewNativeLibraryFromPackage(String packageName,