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

Merge "Add test api for CTS to test resource lost event" into rvc-dev am: bc93009274

Browse Source 
Change-Id: I447c1171beb1d8c00e7e88acafc940854b813b41
This commit is contained in:
Henry Fang
2020-04-03 20:28:55 +00:00
committed by Automerger Merge Worker
parent 29700c2041 bc93009274
commit 6cb58060ef
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/test-current.txt
View File

@@ -1513,6 +1513,10 @@ package android.media {
field public static final String SAMPLE_RATE = "android.media.audiotrack.sampleRate"; field public static final String SAMPLE_RATE = "android.media.audiotrack.sampleRate";
} }
public final class MediaCas implements java.lang.AutoCloseable {
method public void forceResourceLost();
}
public static final class MediaCodecInfo.VideoCapabilities.PerformancePoint { public static final class MediaCodecInfo.VideoCapabilities.PerformancePoint {
ctor public MediaCodecInfo.VideoCapabilities.PerformancePoint(int, int, int, int, @NonNull android.util.Size); ctor public MediaCodecInfo.VideoCapabilities.PerformancePoint(int, int, int, int, @NonNull android.util.Size);
ctor public MediaCodecInfo.VideoCapabilities.PerformancePoint(@NonNull android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint, @NonNull android.util.Size); ctor public MediaCodecInfo.VideoCapabilities.PerformancePoint(@NonNull android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint, @NonNull android.util.Size);

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

@@ -19,6 +19,7 @@ package android.media;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.TestApi;
import android.content.Context; import android.content.Context;
import android.hardware.cas.V1_0.HidlCasPluginDescriptor; import android.hardware.cas.V1_0.HidlCasPluginDescriptor;
import android.hardware.cas.V1_0.ICas; import android.hardware.cas.V1_0.ICas;
@@ -1076,6 +1077,17 @@ public final class MediaCas implements AutoCloseable {
} }
} }
/**
* Release Cas session. This is primarily used as a test API for CTS.
* @hide
*/
@TestApi
public void forceResourceLost() {
if (mResourceListener != null) {
mResourceListener.onReclaimResources();
}
}
@Override @Override
public void close() { public void close() {
if (mICas != null) { if (mICas != null) {