Merge "Add test api for CTS to test resource lost event" into rvc-dev am:... (e5df9e3d) · Commits · e / os / android_frameworks_base

api/test-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -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);

+12 −0

Original line number	Diff line number	Diff line
		@@ -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) {