diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2011-01-12 00:04:27 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-12 00:04:27 -0800 |
| commit | 43194ce05eef26665572fb248a108fd24d247a8f (patch) | |
| tree | 3134a5c52a7ba2859e14d3351ee1e7f98f381aca /core/java/android/content/ContentResolver.java | |
| parent | 5eefd98aa3c461c65822cce56e04a7e5d1af2dae (diff) | |
| parent | 52d70722654548d156bd7a1cb8c1f05b94b09f06 (diff) | |
am 52d70722: am cb842753: Merge "Closing cursor in finalizer to avoid GREF and fd leak in acore"
* commit '52d70722654548d156bd7a1cb8c1f05b94b09f06':
Closing cursor in finalizer to avoid GREF and fd leak in acore
Diffstat (limited to 'core/java/android/content/ContentResolver.java')
| -rw-r--r-- | core/java/android/content/ContentResolver.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index d03422922bc9..b785bfd7af20 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -1526,9 +1526,11 @@ public abstract class ContentResolver { @Override protected void finalize() throws Throwable { + // TODO: integrate CloseGuard support. try { if(!mCloseFlag) { - ContentResolver.this.releaseProvider(mContentProvider); + Log.w(TAG, "Cursor finalized without prior close()"); + close(); } } finally { super.finalize(); |