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

Commit 7f950326 authored by Bart Sears's avatar Bart Sears Committed by Android Git Automerger
Browse files

am e31c0529: am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests... 

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

* commit 'e31c0529':
  DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
parents fd6d8a8b e31c0529

core/java/android/webkit/WebView.java

+10 −0
Original line number Diff line number Diff line
@@ -685,6 +685,16 @@ public class WebView extends AbsoluteLayout 
        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

     * the JavaScript property window.navigator.isOnline and

core/java/android/webkit/WebViewFactoryProvider.java

+5 −0
Original line number Diff line number Diff line
@@ -49,6 +49,11 @@ public interface WebViewFactoryProvider { 
         */

        String getDefaultUserAgent(Context context);



        /**

         * Used for tests only.

         */

         void freeMemoryForTests();



        /**

         * Implements the API method:

         * {@link android.webkit.WebView#setWebContentsDebuggingEnabled(boolean) }