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

Commit 5a0a37e2 authored Mar 03, 2014 by Bart Sears Committed by Android Git Automerger Mar 03, 2014

am 73eefce3: am 7f950326: am e31c0529: am 4e1bf732: Merge "DO NOT MERGE:...

am 73eefce3: am 7f950326: am e31c0529: am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev

* commit '73eefce3':
  DO NOT MERGE: Adding freeMemoryForTests static method to WebView.

parents 9f141fbb 73eefce3

core/java/android/webkit/WebView.java

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -685,6 +685,16 @@ public class WebView extends AbsoluteLayout
	getFactory().getStatics().setPlatformNotificationsEnabled(false);		getFactory().getStatics().setPlatformNotificationsEnabled(false);
	}		}

			/**
			* Used only by internal tests to free up memory.
			*
			* @hide
			*/
			public static void freeMemoryForTests() {
			checkThread();
			getFactory().getStatics().freeMemoryForTests();
			}

	/**		/**
	* Informs WebView of the network state. This is used to set		* Informs WebView of the network state. This is used to set
	* the JavaScript property window.navigator.isOnline and		* the JavaScript property window.navigator.isOnline and

core/java/android/webkit/WebViewFactoryProvider.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -49,6 +49,11 @@ public interface WebViewFactoryProvider {
	*/		*/
	String getDefaultUserAgent(Context context);		String getDefaultUserAgent(Context context);

			/**
			* Used for tests only.
			*/
			void freeMemoryForTests();

	/**		/**
	* Implements the API method:		* Implements the API method:
	* {@link android.webkit.WebView#setWebContentsDebuggingEnabled(boolean) }		* {@link android.webkit.WebView#setWebContentsDebuggingEnabled(boolean) }