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

Merge "Fix MediaCas CTS failure TRM is checking input parameters and won't allow null executor. Use context main executor to call Tuner Resource Manager (TRM)" into rvc-dev am: bdc05af123 am: 1278c0bcaf am: af0636a39f

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12162120

Change-Id: I26a7c280520196e33df3df25b844d965ec649ea1
This commit is contained in:
Henry Fang
2020-07-16 19:42:24 +00:00
committed by Automerger Merge Worker
parent 91d593209e af0636a39f
commit ed58a415ec
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
media/java/android/media/MediaCas.java
View File

@@ -34,7 +34,6 @@ import android.media.tv.tunerresourcemanager.ResourceClientProfile;
import android.media.tv.tunerresourcemanager.TunerResourceManager; import android.media.tv.tunerresourcemanager.TunerResourceManager;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.HandlerExecutor;
import android.os.HandlerThread; import android.os.HandlerThread;
import android.os.IHwBinder; import android.os.IHwBinder;
import android.os.Looper; import android.os.Looper;
@@ -50,6 +49,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
@@ -392,7 +392,10 @@ public final class MediaCas implements AutoCloseable {
@Override @Override
public void onReclaimResources() { public void onReclaimResources() {
synchronized (mSessionMap) { synchronized (mSessionMap) {
mSessionMap.forEach((casSession, sessionResourceHandle) -> casSession.close()); List<Session> sessionList = new ArrayList<>(mSessionMap.keySet());
for (Session casSession: sessionList) {
casSession.close();
}
} }
mEventHandler.sendMessage(mEventHandler.obtainMessage( mEventHandler.sendMessage(mEventHandler.obtainMessage(
EventHandler.MSG_CAS_RESOURCE_LOST)); EventHandler.MSG_CAS_RESOURCE_LOST));
@@ -734,7 +737,7 @@ public final class MediaCas implements AutoCloseable {
ResourceClientProfile profile = ResourceClientProfile profile =
new ResourceClientProfile(tvInputServiceSessionId, priorityHint); new ResourceClientProfile(tvInputServiceSessionId, priorityHint);
mTunerResourceManager.registerClientProfile( mTunerResourceManager.registerClientProfile(
profile, new HandlerExecutor(mEventHandler), mResourceListener, clientId); profile, context.getMainExecutor(), mResourceListener, clientId);
mClientId = clientId[0]; mClientId = clientId[0];
} }
} }