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

Commit c87b7705 authored by John Reck's avatar John Reck
Browse files

Fix contentInvalidateAll NPE 

 Bug: 5220835
 It is possible to call setProperty before webcore has initialized.
 In that case, the content invalidate is unnecessary as there is no
 content to invalidate, so just ignore the request.

Change-Id: I52471a1739443ba8f1e514a5908678552246d80b
parent 05ef0439

core/java/android/webkit/WebView.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -9120,8 +9120,10 @@ public class WebView extends AbsoluteLayout 




    /** @hide send content invalidate */

    /** @hide send content invalidate */

    protected void contentInvalidateAll() {

    protected void contentInvalidateAll() {

        if (mWebViewCore != null && !mBlockWebkitViewMessages) {

            mWebViewCore.sendMessage(EventHub.CONTENT_INVALIDATE_ALL);

            mWebViewCore.sendMessage(EventHub.CONTENT_INVALIDATE_ALL);

        }

        }

    }





    /** @hide call pageSwapCallback upon next page swap */

    /** @hide call pageSwapCallback upon next page swap */

    protected void registerPageSwapCallback() {

    protected void registerPageSwapCallback() {