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

Commit 911d63d1 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 5309557 - Monkeys and SIGSEGV do not mix!"

parents 98da88c3 cc2264fe

core/java/android/webkit/WebView.java

+2 −2
Original line number Diff line number Diff line
@@ -5580,7 +5580,7 @@ public class WebView extends AbsoluteLayout 
        setActive(hasWindowFocus);

        if (hasWindowFocus) {

            JWebCoreJavaBridge.setActiveWebView(this);

            if (mPictureUpdatePausedForFocusChange) {

            if (mPictureUpdatePausedForFocusChange && mNativeClass != 0) {

                WebViewCore.resumeUpdatePicture(mWebViewCore);

                nativeSetIsScrolling(false);

                mPictureUpdatePausedForFocusChange = false;
@@ -5588,7 +5588,7 @@ public class WebView extends AbsoluteLayout 
        } else {

            JWebCoreJavaBridge.removeActiveWebView(this);

            final WebSettings settings = getSettings();

            if (settings != null && settings.enableSmoothTransition() &&

            if (settings != null && settings.enableSmoothTransition() && mNativeClass != 0 &&

                    mWebViewCore != null && !WebViewCore.isUpdatePicturePaused(mWebViewCore)) {

                WebViewCore.pauseUpdatePicture(mWebViewCore);

                nativeSetIsScrolling(true);