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
This commit is contained in:
Jeff Sharkey
2015-12-03 16:59:58 +00:00
committed by Gerrit Code Review
parent 29e0b6e789 f783c02c61
commit e8651aed4b
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);