diff options
| author | 2011-07-28 19:36:32 -0700 | |
|---|---|---|
| committer | 2011-07-28 19:36:32 -0700 | |
| commit | 3970f6833d3c19f96cc7b6831327c8488932fa57 (patch) | |
| tree | 4d176cfb9cbe3d93c9ba8bdbdbf062b91c2f0755 | |
| parent | c564042a3e538add9263f0baa5ee4c0def550f23 (diff) | |
| parent | f40216f98aa63df4a4ff1f26692502cd9078a6fa (diff) | |
Merge "Fix a bug where a provider could be never released."
| -rw-r--r-- | core/java/android/content/ContentResolver.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index 364821e0e6cd..1e720929bbf4 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -532,7 +532,7 @@ public abstract class ContentResolver { try { AssetFileDescriptor fd = provider.openAssetFile(uri, mode); if(fd == null) { - releaseProvider(provider); + // The provider will be released by the finally{} clause return null; } ParcelFileDescriptor pfd = new ParcelFileDescriptorInner( @@ -596,7 +596,7 @@ public abstract class ContentResolver { try { AssetFileDescriptor fd = provider.openTypedAssetFile(uri, mimeType, opts); if (fd == null) { - releaseProvider(provider); + // The provider will be released by the finally{} clause return null; } ParcelFileDescriptor pfd = new ParcelFileDescriptorInner( |