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

Commit a9c22189 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Avoid a double decrease of reference counter for unstable provider" am: e8651aed 

am: aae0a49c

* commit 'aae0a49c':
  Avoid a double decrease of reference counter for unstable provider
parents c32406e8 aae0a49c

core/java/android/content/ContentResolver.java

+2 −0
Original line number Diff line number Diff line
@@ -984,6 +984,7 @@ public abstract class ContentResolver { 
                        stableProvider = acquireProvider(uri);

                    }

                    releaseUnstableProvider(unstableProvider);

                    unstableProvider = null;

                    ParcelFileDescriptor pfd = new ParcelFileDescriptorInner(

                            fd.getParcelFileDescriptor(), stableProvider);
@@ -1128,6 +1129,7 @@ public abstract class ContentResolver { 
                stableProvider = acquireProvider(uri);

            }

            releaseUnstableProvider(unstableProvider);

            unstableProvider = null;

            ParcelFileDescriptor pfd = new ParcelFileDescriptorInner(

                    fd.getParcelFileDescriptor(), stableProvider);