From 1eef1d2f26bc6a6756a904d33789c4be264bf450 Mon Sep 17 00:00:00 2001 From: Henry Fang Date: Thu, 26 Mar 2020 13:07:23 -0700 Subject: [PATCH] Add test api for CTS to test resource lost event bug: 152343262 Test: Manual Change-Id: I5660cea3e57771c8a09f57ed88723064bb592c30 --- api/test-current.txt | 4 ++++ media/java/android/media/MediaCas.java | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/api/test-current.txt b/api/test-current.txt index 0ca8b2dfb0d0d..4eeaaf87ea0dc 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 ad9486cc6597f..405410a054de9 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) {