Skip to content

Commit d4fdc0f

Browse files
jreckAndroid (Google) Code Review
authored andcommitted
Merge "Prevent pause/resuming a destroyed WebViewCore"
2 parents 911d63d + 2f4d30a commit d4fdc0f

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

core/java/android/webkit/WebViewCore.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2085,6 +2085,10 @@ static void pauseUpdatePicture(WebViewCore core) {
20852085
if (!core.getSettings().enableSmoothTransition()) return;
20862086

20872087
synchronized (core) {
2088+
if (core.mNativeClass == 0) {
2089+
Log.w(LOGTAG, "Cannot pauseUpdatePicture, core destroyed or not initialized!");
2090+
return;
2091+
}
20882092
core.nativeSetIsPaused(true);
20892093
core.mDrawIsPaused = true;
20902094
}
@@ -2099,6 +2103,10 @@ static void resumeUpdatePicture(WebViewCore core) {
20992103
return;
21002104

21012105
synchronized (core) {
2106+
if (core.mNativeClass == 0) {
2107+
Log.w(LOGTAG, "Cannot resumeUpdatePicture, core destroyed!");
2108+
return;
2109+
}
21022110
core.nativeSetIsPaused(false);
21032111
core.mDrawIsPaused = false;
21042112
// always redraw on resume to reenable gif animations

0 commit comments

Comments
 (0)