diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 37a7182dd0be3..2f7347458d8f5 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -5580,18 +5580,16 @@ public class WebView extends AbsoluteLayout
         setActive(hasWindowFocus);
         if (hasWindowFocus) {
             JWebCoreJavaBridge.setActiveWebView(this);
-            if (mPictureUpdatePausedForFocusChange && mNativeClass != 0) {
+            if (mPictureUpdatePausedForFocusChange) {
                 WebViewCore.resumeUpdatePicture(mWebViewCore);
-                nativeSetIsScrolling(false);
                 mPictureUpdatePausedForFocusChange = false;
             }
         } else {
             JWebCoreJavaBridge.removeActiveWebView(this);
             final WebSettings settings = getSettings();
-            if (settings != null && settings.enableSmoothTransition() && mNativeClass != 0 &&
+            if (settings != null && settings.enableSmoothTransition() &&
                     mWebViewCore != null && !WebViewCore.isUpdatePicturePaused(mWebViewCore)) {
                 WebViewCore.pauseUpdatePicture(mWebViewCore);
-                nativeSetIsScrolling(true);
                 mPictureUpdatePausedForFocusChange = true;
             }
         }