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

Merge "Add thread protection for Filter/Descrambler table Use weak reference in the tables to allow objects released by caller"

Browse Source
This commit is contained in:
Treehugger Robot
2020-12-30 23:14:45 +00:00
committed by Gerrit Code Review
parent ba032abd1a 06eab7931a
commit d7275581e1
1 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
media/java/android/media/tv/tuner/Tuner.java
View File

@@ -60,6 +60,7 @@ import com.android.internal.util.FrameworkStatsLog;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.ref.WeakReference;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -228,8 +229,8 @@ public class Tuner implements AutoCloseable {
private Executor mOnResourceLostListenerExecutor; private Executor mOnResourceLostListenerExecutor;
private Integer mDemuxHandle; private Integer mDemuxHandle;
private Map<Integer, Descrambler> mDescramblers = new HashMap<>(); private Map<Integer, WeakReference<Descrambler>> mDescramblers = new HashMap<>();
private List<Filter> mFilters = new ArrayList<>(); private List<WeakReference<Filter>> mFilters = new ArrayList<WeakReference<Filter>>();
private final TunerResourceManager.ResourcesReclaimListener mResourceListener = private final TunerResourceManager.ResourcesReclaimListener mResourceListener =
new TunerResourceManager.ResourcesReclaimListener() { new TunerResourceManager.ResourcesReclaimListener() {
@@ -382,18 +383,28 @@ public class Tuner implements AutoCloseable {
if (mLnb != null) { if (mLnb != null) {
mLnb.close(); mLnb.close();
} }
if (!mDescramblers.isEmpty()) { synchronized (mDescramblers) {
for (Map.Entry<Integer, Descrambler> d : mDescramblers.entrySet()) { if (!mDescramblers.isEmpty()) {
d.getValue().close(); for (Map.Entry<Integer, WeakReference<Descrambler>> d : mDescramblers.entrySet()) {
mTunerResourceManager.releaseDescrambler(d.getKey(), mClientId); Descrambler descrambler = d.getValue().get();
if (descrambler != null) {
descrambler.close();
}
mTunerResourceManager.releaseDescrambler(d.getKey(), mClientId);
}
mDescramblers.clear();
} }
mDescramblers.clear();
} }
if (!mFilters.isEmpty()) { synchronized (mFilters) {
for (Filter f : mFilters) { if (!mFilters.isEmpty()) {
f.close(); for (WeakReference<Filter> weakFilter : mFilters) {
Filter filter = weakFilter.get();
if (filter != null) {
filter.close();
}
}
mFilters.clear();
} }
mFilters.clear();
} }
if (mDemuxHandle != null) { if (mDemuxHandle != null) {
int res = nativeCloseDemux(mDemuxHandle); int res = nativeCloseDemux(mDemuxHandle);
@@ -950,7 +961,10 @@ public class Tuner implements AutoCloseable {
if (mHandler == null) { if (mHandler == null) {
mHandler = createEventHandler(); mHandler = createEventHandler();
} }
mFilters.add(filter); synchronized (mFilters) {
WeakReference<Filter> weakFilter = new WeakReference<Filter>(filter);
mFilters.add(weakFilter);
}
} }
return filter; return filter;
} }
@@ -1118,7 +1132,10 @@ public class Tuner implements AutoCloseable {
int handle = descramblerHandle[0]; int handle = descramblerHandle[0];
Descrambler descrambler = nativeOpenDescramblerByHandle(handle); Descrambler descrambler = nativeOpenDescramblerByHandle(handle);
if (descrambler != null) { if (descrambler != null) {
mDescramblers.put(handle, descrambler); synchronized (mDescramblers) {
WeakReference weakDescrambler = new WeakReference<Descrambler>(descrambler);
mDescramblers.put(handle, weakDescrambler);
}
} else { } else {
mTunerResourceManager.releaseDescrambler(handle, mClientId); mTunerResourceManager.releaseDescrambler(handle, mClientId);
} }