diff options
| author | Patrick Scott <phanna@android.com> | 2010-08-11 07:18:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-11 07:18:27 -0700 |
| commit | dc1f08586eadc3a3dbbdf22b520ba1065b2032f8 (patch) | |
| tree | d974667213a6de1b59e361abf0db7052638a2724 | |
| parent | 03381faf3492cd1360b3d239c6f23a801c9d4b7f (diff) | |
| parent | 9902196f9885d369e37cf44084e3f04513511ab0 (diff) | |
| download | frameworks_base-dc1f08586eadc3a3dbbdf22b520ba1065b2032f8.zip frameworks_base-dc1f08586eadc3a3dbbdf22b520ba1065b2032f8.tar.gz frameworks_base-dc1f08586eadc3a3dbbdf22b520ba1065b2032f8.tar.bz2 | |
am 9902196f: Fix npe in getCacheTotalSize.
Merge commit '9902196f9885d369e37cf44084e3f04513511ab0' into gingerbread-plus-aosp
* commit '9902196f9885d369e37cf44084e3f04513511ab0':
Fix npe in getCacheTotalSize.
| -rw-r--r-- | core/java/android/webkit/WebViewDatabase.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebViewDatabase.java b/core/java/android/webkit/WebViewDatabase.java index b18419d..7acd9ba 100644 --- a/core/java/android/webkit/WebViewDatabase.java +++ b/core/java/android/webkit/WebViewDatabase.java @@ -727,6 +727,9 @@ public class WebViewDatabase { } long getCacheTotalSize() { + if (mCacheDatabase == null) { + return 0; + } long size = 0; Cursor cursor = null; final String query = "SELECT SUM(contentlength) as sum FROM cache"; |