diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-04-22 17:12:34 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-04-22 17:12:34 -0700 |
| commit | 74008f608af0c567456d37e63d48643689388c74 (patch) | |
| tree | 02354593bed51d5c4bb0ac5f9b44032034cbbaaf /core/java/android/webkit/WebSettings.java | |
| parent | 6fc52c4928ec8a658d7eb0b7881fcbc879aeb18c (diff) | |
| parent | 644cf62660c87a9b8d5bcb22412cc2ad2aeea291 (diff) | |
| download | frameworks_base-74008f608af0c567456d37e63d48643689388c74.zip frameworks_base-74008f608af0c567456d37e63d48643689388c74.tar.gz frameworks_base-74008f608af0c567456d37e63d48643689388c74.tar.bz2 | |
Merge donut into master
Diffstat (limited to 'core/java/android/webkit/WebSettings.java')
| -rw-r--r-- | core/java/android/webkit/WebSettings.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index c18f157..98e66b6 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -1130,7 +1130,7 @@ public class WebSettings { /*package*/ synchronized void syncSettingsAndCreateHandler(BrowserFrame frame) { mBrowserFrame = frame; - if (android.util.Config.DEBUG) { + if (WebView.DEBUG) { junit.framework.Assert.assertTrue(frame.mNativeFrame != 0); } nativeSync(frame.mNativeFrame); |