Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: e8651aed4b

* commit 'e8651aed4b8a2c6703589069e26f5be750b2a947':
  Avoid a double decrease of reference counter for unstable provider
This commit is contained in:
Jeff Sharkey
2015-12-03 17:07:50 +00:00
committed by android-build-merger
parent 67003be3f8 e8651aed4b
commit aae0a49c16
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/ContentResolver.java
View File

@@ -984,6 +984,7 @@ public abstract class ContentResolver {
stableProvider = acquireProvider(uri); stableProvider = acquireProvider(uri);
} }
releaseUnstableProvider(unstableProvider); releaseUnstableProvider(unstableProvider);
unstableProvider = null;
ParcelFileDescriptor pfd = new ParcelFileDescriptorInner( ParcelFileDescriptor pfd = new ParcelFileDescriptorInner(
fd.getParcelFileDescriptor(), stableProvider); fd.getParcelFileDescriptor(), stableProvider);
@@ -1128,6 +1129,7 @@ public abstract class ContentResolver {
stableProvider = acquireProvider(uri); stableProvider = acquireProvider(uri);
} }
releaseUnstableProvider(unstableProvider); releaseUnstableProvider(unstableProvider);
unstableProvider = null;
ParcelFileDescriptor pfd = new ParcelFileDescriptorInner( ParcelFileDescriptor pfd = new ParcelFileDescriptorInner(
fd.getParcelFileDescriptor(), stableProvider); fd.getParcelFileDescriptor(), stableProvider);