Merge "Prevent pause/resuming a destroyed WebViewCore"
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