commit d4fdc0f5621098d89c686a0edbfc22247005c46c
author John Reck <jreck@google.com> Tue Sep 13 17:23:11 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 13 17:23:11 2011 -0700
tree 59841fd1ba9a94fb2511f16fd2b577b51e198501
parent 911d63d1598b4e8105e9a14d8e1c120f54548cbc
parent 2f4d30a2a6df349d2af59c161548a285a536b98a

Merge "Prevent pause/resuming a destroyed WebViewCore"

core/java/android/webkit/WebViewCore.java

diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
index 843a624..48359d44 100644
--- a/core/java/android/webkit/WebViewCore.java
+++ b/core/java/android/webkit/WebViewCore.java
@@ -2085,6 +2085,10 @@
             if (!core.getSettings().enableSmoothTransition()) return;
 
             synchronized (core) {
+                if (core.mNativeClass == 0) {
+                    Log.w(LOGTAG, "Cannot pauseUpdatePicture, core destroyed or not initialized!");
+                    return;
+                }
                 core.nativeSetIsPaused(true);
                 core.mDrawIsPaused = true;
             }
@@ -2099,6 +2103,10 @@
                 return;
 
             synchronized (core) {
+                if (core.mNativeClass == 0) {
+                    Log.w(LOGTAG, "Cannot resumeUpdatePicture, core destroyed!");
+                    return;
+                }
                 core.nativeSetIsPaused(false);
                 core.mDrawIsPaused = false;
                 // always redraw on resume to reenable gif animations