diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-10-07 20:17:19 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2014-10-07 20:17:19 -0700 |
| commit | 955d8d69ea6caabce1461dc25b339b9bf9dc61a6 (patch) | |
| tree | f6bd4b5d4be17a8e237e837d59c3f8aaa76ebe55 /core/java/android/webkit | |
| parent | 0d334365c6123388a0df81438b82122be29d19ab (diff) | |
| download | frameworks_base-955d8d69ea6caabce1461dc25b339b9bf9dc61a6.zip frameworks_base-955d8d69ea6caabce1461dc25b339b9bf9dc61a6.tar.gz frameworks_base-955d8d69ea6caabce1461dc25b339b9bf9dc61a6.tar.bz2 | |
Put in real "code" (aka marketing) name.
Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
Diffstat (limited to 'core/java/android/webkit')
| -rw-r--r-- | core/java/android/webkit/CookieManager.java | 3 | ||||
| -rw-r--r-- | core/java/android/webkit/WebSettings.java | 4 | ||||
| -rw-r--r-- | core/java/android/webkit/WebView.java | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/core/java/android/webkit/CookieManager.java b/core/java/android/webkit/CookieManager.java index de7d2d0..20ef646 100644 --- a/core/java/android/webkit/CookieManager.java +++ b/core/java/android/webkit/CookieManager.java @@ -17,7 +17,6 @@ package android.webkit; import android.net.WebAddress; -import android.webkit.ValueCallback; /** * Manages the cookies used by an application's {@link WebView} instances. @@ -81,7 +80,7 @@ public class CookieManager { * <p> * Apps that target {@link android.os.Build.VERSION_CODES#KITKAT} or below * default to allowing third party cookies. Apps targeting - * {@link android.os.Build.VERSION_CODES#L} or later default to disallowing + * {@link android.os.Build.VERSION_CODES#LOLLIPOP} or later default to disallowing * third party cookies. * * @param webview the {@link WebView} instance to set the cookie policy on diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 6d7c803..db8fc6f 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -1461,7 +1461,7 @@ public abstract class WebSettings { * * By default, apps that target {@link android.os.Build.VERSION_CODES#KITKAT} or below default * to {@link #MIXED_CONTENT_ALWAYS_ALLOW}. Apps targeting - * {@link android.os.Build.VERSION_CODES#L} default to {@link #MIXED_CONTENT_NEVER_ALLOW}. + * {@link android.os.Build.VERSION_CODES#LOLLIPOP} default to {@link #MIXED_CONTENT_NEVER_ALLOW}. * * The preferred and most secure mode of operation for the WebView is * {@link #MIXED_CONTENT_NEVER_ALLOW} and use of {@link #MIXED_CONTENT_ALWAYS_ALLOW} is @@ -1482,7 +1482,7 @@ public abstract class WebSettings { /** * Sets whether to use a video overlay for embedded encrypted video. - * In API levels prior to {@link android.os.Build.VERSION_CODES#L}, encrypted video can + * In API levels prior to {@link android.os.Build.VERSION_CODES#LOLLIPOP}, encrypted video can * only be rendered directly on a secure video surface, so it had been a hard problem to play * encrypted video in HTML. When this flag is on, WebView can play encrypted video (MSE/EME) * by using a video overlay (aka hole-punching) for videos embedded using HTML <video> diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 081bfdf..40aee96 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -25,7 +25,6 @@ import android.graphics.Paint; import android.graphics.Picture; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.net.Uri; import android.net.http.SslCertificate; import android.os.Build; import android.os.Bundle; @@ -1754,7 +1753,7 @@ public class WebView extends AbsoluteLayout * safety. * </li> * <li> The Java object's fields are not accessible.</li> - * <li> For applications targeted to API level {@link android.os.Build.VERSION_CODES#L} + * <li> For applications targeted to API level {@link android.os.Build.VERSION_CODES#LOLLIPOP} * and above, methods of injected Java objects are enumerable from * JavaScript.</li> * </ul> |