Fix a bug where a provider could be never released.

Bug: 5034192
Change-Id: I5d4adf27ea933687d4a0bc5ee76d57b74e708eec

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(