commit 23d188873a5d54b5508d0f4679579e2faf7c0336
author Jeff Sharkey <jsharkey@android.com> Thu Dec 03 19:22:30 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 03 19:22:30 2015 +0000
tree ad53d1a85ef6eee687e063fb732fdba3e36d6d3c
parent dd2e8d6a0e9e5cc6914b852f7f35564526b2a0bc
parent a9c22189404b5cb1f4e66ca3ff99ed8e04403f1e

Merge "Avoid a double decrease of reference counter for unstable provider" am: e8651aed4b am: aae0a49c16
am: a9c2218940

* commit 'a9c22189404b5cb1f4e66ca3ff99ed8e04403f1e':
  Avoid a double decrease of reference counter for unstable provider

core/java/android/content/ContentResolver.java

diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java
index 853bc6c..9d0ebc2 100644
--- a/core/java/android/content/ContentResolver.java
+++ b/core/java/android/content/ContentResolver.java
@@ -986,6 +986,7 @@
                         stableProvider = acquireProvider(uri);
                     }
                     releaseUnstableProvider(unstableProvider);
+                    unstableProvider = null;
                     ParcelFileDescriptor pfd = new ParcelFileDescriptorInner(
                             fd.getParcelFileDescriptor(), stableProvider);
 
@@ -1130,6 +1131,7 @@
                 stableProvider = acquireProvider(uri);
             }
             releaseUnstableProvider(unstableProvider);
+            unstableProvider = null;
             ParcelFileDescriptor pfd = new ParcelFileDescriptorInner(
                     fd.getParcelFileDescriptor(), stableProvider);