summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikhail Naganov <mnaganov@google.com>2012-08-07 13:57:42 +0100
committerMikhail Naganov <mnaganov@google.com>2012-08-08 10:02:39 +0100
commit65e7ace9796f1d29faecacc8dd7f35ba7ae647e5 (patch)
treee5628456a56466c00b317068fca51f2a3f11540c
parent071efcac338661d027f7ff391865574e7db716e7 (diff)
downloadframeworks_base-65e7ace9796f1d29faecacc8dd7f35ba7ae647e5.zip
frameworks_base-65e7ace9796f1d29faecacc8dd7f35ba7ae647e5.tar.gz
frameworks_base-65e7ace9796f1d29faecacc8dd7f35ba7ae647e5.tar.bz2
Clarify JavaDoc of WebSettings.setAllowFileAccessFromFileURLs.
According to CTS tests (WebSettingsTest.testLocalImageLoads), local images access is allowed regardless of the state of AllowFileAccessFromFileURLs. Bug: 5461416 Change-Id: I71f5c38a6b0f3720c8c369c0e19f379c78ace06f
-rw-r--r--core/java/android/webkit/WebSettings.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index cb54600..d02bd48 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -925,6 +925,9 @@ public abstract class WebSettings {
* access to content from other file scheme URLs. See
* {@link #setAllowFileAccessFromFileURLs}. To enable the most restrictive,
* and therefore secure policy, this setting should be disabled.
+ * Note that this setting affects only JavaScript access to file scheme
+ * resources. Other access to such resources, for example, from image HTML
+ * elements, is unaffected.
* <p>
* The default value is true for API level
* {@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH_MR1} and below,
@@ -942,6 +945,9 @@ public abstract class WebSettings {
* enable the most restrictive, and therefore secure policy, this setting
* should be disabled. Note that the value of this setting is ignored if
* the value of {@link #getAllowUniversalAccessFromFileURLs} is true.
+ * Note too, that this setting affects only JavaScript access to file scheme
+ * resources. Other access to such resources, for example, from image HTML
+ * elements, is unaffected.
* <p>
* The default value is true for API level
* {@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH_MR1} and below,