Merge "Add websettings API for file origin policy." (caf7f3d1) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −1

Original line number	Diff line number	Diff line
		@@ -26033,10 +26033,12 @@ package android.webkit {
		method public void setMimeType(java.lang.String);
		}

		public class WebSettings {
		public abstract class WebSettings {
		method public boolean enableSmoothTransition();
		method public boolean getAllowContentAccess();
		method public boolean getAllowFileAccess();
		method public abstract boolean getAllowFileAccessFromFileURLs();
		method public abstract boolean getAllowUniversalAccessFromFileURLs();
		method public synchronized boolean getBlockNetworkImage();
		method public synchronized boolean getBlockNetworkLoads();
		method public boolean getBuiltInZoomControls();
		@@ -26078,6 +26080,8 @@ package android.webkit {
		method public synchronized java.lang.String getUserAgentString();
		method public void setAllowContentAccess(boolean);
		method public void setAllowFileAccess(boolean);
		method public abstract void setAllowFileAccessFromFileURLs(boolean);
		method public abstract void setAllowUniversalAccessFromFileURLs(boolean);
		method public synchronized void setAppCacheEnabled(boolean);
		method public synchronized void setAppCacheMaxSize(long);
		method public synchronized void setAppCachePath(java.lang.String);

core/java/android/webkit/WebSettings.java

+45 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.webkit;

		import android.os.Message;
		import android.os.Build;

		/**
		* Manages settings state for a WebView. When a WebView is first created, it
		@@ -29,7 +30,7 @@ import android.os.Message;
		// This is (effectively) an abstract base class; concrete WebViewProviders must
		// create a class derived from this, and return an instance of it in the
		// WebViewProvider.getWebSettingsProvider() method implementation.
		public class WebSettings {
		public abstract class WebSettings {
		// TODO: Remove MustOverrideException and make all methods throwing it abstract instead;
		// needs API file update.
		private static class MustOverrideException extends RuntimeException {
		@@ -770,6 +771,29 @@ public class WebSettings {
		throw new MustOverrideException();
		}

		/**
		* Configure scripting (such as XmlHttpRequest) access from file scheme URLs
		* to any origin. Note, calling this method with a true argument value also
		* implies calling setAllowFileAccessFromFileURLs with a true. The default
		* value is false for API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN}
		* and higher and true otherwise.
		*
		. * @param flag True if the WebView should allow scripting access from file
		* scheme URLs to any origin
		*/
		public abstract void setAllowUniversalAccessFromFileURLs(boolean flag);

		/**
		* Configure scripting (such as XmlHttpRequest) access from file scheme URLs
		* to file origin. The default value is false for API level
		* {@link android.os.Build.VERSION_CODES#JELLY_BEAN} and higher and true
		* otherwise.
		*
		* @param flag True if the WebView should allow scripting access from file
		* scheme URLs to file origin
		*/
		public abstract void setAllowFileAccessFromFileURLs(boolean flag);

		/**
		* Tell the WebView to enable plugins.
		* @param flag True if the WebView should load plugins.
		@@ -911,6 +935,26 @@ public class WebSettings {
		throw new MustOverrideException();
		}

		/**
		* Return true if scripting access {see @setAllowUniversalAccessFromFileURLs} from
		* file URLs to any origin is enabled. The default value is false for API level
		* {@link android.os.Build.VERSION_CODES#JELLY_BEAN} and higher and true otherwise.
		*
		* @return True if the WebView allows scripting access from file scheme requests
		* to any origin
		*/
		public abstract boolean getAllowUniversalAccessFromFileURLs();

		/**
		* Return true if scripting access {see @setAllowFileAccessFromFileURLs} from file
		* URLs to file origin is enabled. The default value is false for API level
		* {@link android.os.Build.VERSION_CODES#JELLY_BEAN} and higher, and true otherwise.
		*
		* @return True if the WebView allows scripting access from file scheme requests
		* to file origin
		*/
		public abstract boolean getAllowFileAccessFromFileURLs();

		/**
		* Return true if plugins are enabled.
		* @return True if plugins are enabled.

core/java/android/webkit/WebSettingsClassic.java

+47 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,8 @@ public class WebSettingsClassic extends WebSettings {
		private boolean mBlockNetworkImage = false;
		private boolean mBlockNetworkLoads;
		private boolean mJavaScriptEnabled = false;
		private boolean mAllowUniversalAccessFromFileURLs = false;
		private boolean mAllowFileAccessFromFileURLs = false;
		private boolean mHardwareAccelSkia = false;
		private boolean mShowVisualIndicator = false;
		private PluginState mPluginState = PluginState.OFF;
		@@ -286,6 +288,13 @@ public class WebSettingsClassic extends WebSettings {
		mBlockNetworkLoads = mContext.checkPermission(
		"android.permission.INTERNET", android.os.Process.myPid(),
		android.os.Process.myUid()) != PackageManager.PERMISSION_GRANTED;

		// SDK specific settings. See issue 6212665
		if (mContext.getApplicationInfo().targetSdkVersion <
		Build.VERSION_CODES.JELLY_BEAN) {
		mAllowUniversalAccessFromFileURLs = true;
		mAllowFileAccessFromFileURLs = true;
		}
		}

		private static final String ACCEPT_LANG_FOR_US_LOCALE = "en-US";
		@@ -1100,6 +1109,28 @@ public class WebSettingsClassic extends WebSettings {
		}
		}

		/**
		* @see android.webkit.WebSettings#setAllowUniversalAccessFromFileURLs
		*/
		@Override
		public synchronized void setAllowUniversalAccessFromFileURLs(boolean flag) {
		if (mAllowUniversalAccessFromFileURLs != flag) {
		mAllowUniversalAccessFromFileURLs = flag;
		postSync();
		}
		}

		/**
		* @see android.webkit.WebSettings#setAllowFileAccessFromFileURLs
		*/
		@Override
		public synchronized void setAllowFileAccessFromFileURLs(boolean flag) {
		if (mAllowFileAccessFromFileURLs != flag) {
		mAllowFileAccessFromFileURLs = flag;
		postSync();
		}
		}

		/**
		* Tell the WebView to use Skia's hardware accelerated rendering path
		* @param flag True if the WebView should use Skia's hw-accel path
		@@ -1323,6 +1354,22 @@ public class WebSettingsClassic extends WebSettings {
		return mJavaScriptEnabled;
		}

		/**
		* @see android.webkit.WebSettings#getAllowUniversalFileAccessFromFileURLs
		*/
		@Override
		public synchronized boolean getAllowUniversalAccessFromFileURLs() {
		return mAllowUniversalAccessFromFileURLs;
		}

		/**
		* @see android.webkit.WebSettings#getAllowFileAccessFromFileURLs
		*/
		@Override
		public synchronized boolean getAllowFileAccessFromFileURLs() {
		return mAllowFileAccessFromFileURLs;
		}

		/**
		* @see android.webkit.WebSettings#getPluginsEnabled()
		*/