From 2f4d30a2a6df349d2af59c161548a285a536b98a Mon Sep 17 00:00:00 2001 From: John Reck Date: Tue, 13 Sep 2011 15:50:41 -0700 Subject: [PATCH] Prevent pause/resuming a destroyed WebViewCore Bug: 5246901 Change-Id: I697cd26b74ffb0584bb992d8caa6bae1e6eee0fd --- core/java/android/webkit/WebViewCore.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index 843a62405ef8a..48359d44daca2 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