Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3970f683 authored by Jean Chalard's avatar Jean Chalard Committed by Android (Google) Code Review
Browse files

Merge "Fix a bug where a provider could be never released."

parents c564042a f40216f9

core/java/android/content/ContentResolver.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -532,7 +532,7 @@ public abstract class ContentResolver { 
                try {

                try {

                    AssetFileDescriptor fd = provider.openAssetFile(uri, mode);

                    AssetFileDescriptor fd = provider.openAssetFile(uri, mode);

                    if(fd == null) {

                    if(fd == null) {

                        releaseProvider(provider);

                        // The provider will be released by the finally{} clause

                        return null;

                        return null;

                    }

                    }

                    ParcelFileDescriptor pfd = new ParcelFileDescriptorInner(

                    ParcelFileDescriptor pfd = new ParcelFileDescriptorInner(
@@ -596,7 +596,7 @@ public abstract class ContentResolver { 
        try {

        try {

            AssetFileDescriptor fd = provider.openTypedAssetFile(uri, mimeType, opts);

            AssetFileDescriptor fd = provider.openTypedAssetFile(uri, mimeType, opts);

            if (fd == null) {

            if (fd == null) {

                releaseProvider(provider);

                // The provider will be released by the finally{} clause

                return null;

                return null;

            }

            }

            ParcelFileDescriptor pfd = new ParcelFileDescriptorInner(

            ParcelFileDescriptor pfd = new ParcelFileDescriptorInner(