diff options
| author | John Reck <jreck@google.com> | 2011-09-13 17:23:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-13 17:23:11 -0700 |
| commit | d4fdc0f5621098d89c686a0edbfc22247005c46c (patch) | |
| tree | 59841fd1ba9a94fb2511f16fd2b577b51e198501 | |
| parent | 911d63d1598b4e8105e9a14d8e1c120f54548cbc (diff) | |
| parent | 2f4d30a2a6df349d2af59c161548a285a536b98a (diff) | |
| download | frameworks_base-d4fdc0f5621098d89c686a0edbfc22247005c46c.zip frameworks_base-d4fdc0f5621098d89c686a0edbfc22247005c46c.tar.gz frameworks_base-d4fdc0f5621098d89c686a0edbfc22247005c46c.tar.bz2 | |
Merge "Prevent pause/resuming a destroyed WebViewCore"
| -rw-r--r-- | core/java/android/webkit/WebViewCore.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index 843a624..48359d4 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -2085,6 +2085,10 @@ public final class WebViewCore { 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 @@ public final class WebViewCore { 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 |