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

Commit 23d18887 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:... 

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

* commit 'a9c22189':
  Avoid a double decrease of reference counter for unstable provider
parents dd2e8d6a a9c22189

core/java/android/content/ContentResolver.java

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

                    }

                    releaseUnstableProvider(unstableProvider);

                    unstableProvider = null;

                    ParcelFileDescriptor pfd = new ParcelFileDescriptorInner(

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

            }

            releaseUnstableProvider(unstableProvider);

            unstableProvider = null;

            ParcelFileDescriptor pfd = new ParcelFileDescriptorInner(

                    fd.getParcelFileDescriptor(), stableProvider);