diff options
| author | 2020-04-03 20:09:19 +0000 | |
|---|---|---|
| committer | 2020-04-03 20:09:19 +0000 | |
| commit | bc93009274b4dd570d5127bb3bd3b158d70feb46 (patch) | |
| tree | ca32daddd188ad6da7b34ffe2a91186076d6e26b | |
| parent | 0c33b0a842a102e3dda427140a4cbbb7b1bd3884 (diff) | |
| parent | 1eef1d2f26bc6a6756a904d33789c4be264bf450 (diff) | |
Merge "Add test api for CTS to test resource lost event" into rvc-dev
| -rw-r--r-- | api/test-current.txt | 4 | ||||
| -rw-r--r-- | media/java/android/media/MediaCas.java | 12 |
2 files changed, 16 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index 0ca8b2dfb0d0..4eeaaf87ea0d 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -1513,6 +1513,10 @@ package android.media { 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 { 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); diff --git a/media/java/android/media/MediaCas.java b/media/java/android/media/MediaCas.java index ad9486cc6597..405410a054de 100644 --- a/media/java/android/media/MediaCas.java +++ b/media/java/android/media/MediaCas.java @@ -19,6 +19,7 @@ package android.media; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.TestApi; import android.content.Context; import android.hardware.cas.V1_0.HidlCasPluginDescriptor; 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 public void close() { if (mICas != null) { |