diff options
| author | John Reck <jreck@google.com> | 2011-07-08 11:22:38 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2011-07-08 11:23:39 -0700 |
| commit | d4324aa101a6b8729c99d00fd8f3cbe2aca6f4f0 (patch) | |
| tree | 454c4dc18bf60b8f21471eb8ada79c69393ac48b /core/java/android/webkit | |
| parent | 2ad31117591816ecc6c52f07459aef987b025462 (diff) | |
| download | frameworks_base-d4324aa101a6b8729c99d00fd8f3cbe2aca6f4f0.zip frameworks_base-d4324aa101a6b8729c99d00fd8f3cbe2aca6f4f0.tar.gz frameworks_base-d4324aa101a6b8729c99d00fd8f3cbe2aca6f4f0.tar.bz2 | |
NPE guard in setupViewport
Bug: 4163660
Change-Id: Ie74072094c0dbfca4391cf898420544884101c1f
Diffstat (limited to 'core/java/android/webkit')
| -rw-r--r-- | core/java/android/webkit/WebViewCore.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index 4f97066..49ffb45 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -2245,6 +2245,10 @@ public final class WebViewCore { } private void setupViewport(boolean updateViewState) { + if (mWebView == null || mSettings == null) { + // We've been destroyed or are being destroyed, return early + return; + } // set the viewport settings from WebKit setViewportSettingsFromNative(); |