Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7e279bc9: Merge "Tweak JavaDoc for WebSettings.setAllowUniversalAccessFromFileURLs() and setAllowFileAccessFromFileURLs()" into jb-dev

Browse Source 
* commit '7e279bc91ae1d9a59f00724a2c28ab840bd73423':
  Tweak JavaDoc for WebSettings.setAllowUniversalAccessFromFileURLs() and setAllowFileAccessFromFileURLs()
This commit is contained in:
Steve Block
2012-04-27 03:26:06 -07:00
committed by Android Git Automerger
parent 3d8678f8b1 7e279bc91a
commit a4dcc77422
1 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
core/java/android/webkit/WebSettings.java
View File

@@ -848,25 +848,37 @@ public abstract class WebSettings {
} }
/** /**
* Configures scripting (such as XmlHttpRequest) access from file scheme URLs * Sets whether JavaScript running in the context of a file scheme URL
* to any origin. Note, calling this method with a true argument value also * should be allowed to access content from any origin. This includes
* implies calling setAllowFileAccessFromFileURLs with a true. The default * access to content from other file scheme URLs. See
* value is false for API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN} * {@link #setAllowFileAccessFromFileURLs}. To enable the most restrictive,
* and higher and true otherwise. * and therefore secure policy, this setting should be disabled.
* <p>
* The default value is true for API level
* {@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH_MR1} and below,
* and false for API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN}
* and above.
* *
* @param flag true if the WebView should allow scripting access from file * @param flag whether JavaScript running in the context of a file scheme
* scheme URLs to any origin * URL should be allowed to access content from any origin
*/ */
public abstract void setAllowUniversalAccessFromFileURLs(boolean flag); public abstract void setAllowUniversalAccessFromFileURLs(boolean flag);
/** /**
* Configures scripting (such as XmlHttpRequest) access from file scheme URLs * Sets whether JavaScript running in the context of a file scheme URL
* to file origin. The default value is false for API level * should be allowed to access content from other file scheme URLs. To
* {@link android.os.Build.VERSION_CODES#JELLY_BEAN} and higher and true * enable the most restrictive, and therefore secure policy, this setting
* otherwise. * should be disabled. Note that the value of this setting is ignored if
* the value of {@link #getAllowUniversalAccessFromFileURLs} is true.
* <p>
* The default value is true for API level
* {@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH_MR1} and below,
* and false for API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN}
* and above.
* *
* @param flag true if the WebView should allow scripting access from file * @param flag whether JavaScript running in the context of a file scheme
* scheme URLs to file origin * URL should be allowed to access content from other file
* scheme URLs
*/ */
public abstract void setAllowFileAccessFromFileURLs(boolean flag); public abstract void setAllowFileAccessFromFileURLs(boolean flag);
@@ -1028,21 +1040,22 @@ public abstract class WebSettings {
} }
/** /**
* Gets whether scripting access {see @setAllowUniversalAccessFromFileURLs} from * Gets whether JavaScript running in the context of a file scheme URL can
* file URLs to any origin is enabled. * access content from any origin. This includes access to content from
* other file scheme URLs.
* *
* @return true if the WebView allows scripting access from file scheme requests * @return whether JavaScript running in the context of a file scheme URL
* to any origin * can access content from any origin
* @see #setAllowUniversalAccessFromFileURLs * @see #setAllowUniversalAccessFromFileURLs
*/ */
public abstract boolean getAllowUniversalAccessFromFileURLs(); public abstract boolean getAllowUniversalAccessFromFileURLs();
/** /**
* Gets whether scripting access {see @setAllowFileAccessFromFileURLs} from file * Gets whether JavaScript running in the context of a file scheme URL can
* URLs to file origin is enabled. * access content from other file scheme URLs.
* *
* @return true if the WebView allows scripting access from file scheme requests * @return whether JavaScript running in the context of a file scheme URL
* to file origin * can access content from other file scheme URLs
* @see #setAllowFileAccessFromFileURLs * @see #setAllowFileAccessFromFileURLs
*/ */
public abstract boolean getAllowFileAccessFromFileURLs(); public abstract boolean getAllowFileAccessFromFileURLs();