Merge "Add TestApi annotation for isAidlHal()" (0f5324ba) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -1735,6 +1735,7 @@ package android.media {

		public final class MediaCas implements java.lang.AutoCloseable {
		method public void forceResourceLost();
		method public boolean isAidlHal();
		}

		public static final class MediaCodecInfo.VideoCapabilities.PerformancePoint {
		@@ -1745,6 +1746,10 @@ package android.media {
		method public int getMaxMacroBlocks();
		}

		public final class MediaDescrambler implements java.lang.AutoCloseable {
		method public boolean isAidlHal();
		}

		public final class MediaRoute2Info implements android.os.Parcelable {
		method @NonNull public String getOriginalId();
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -944,10 +944,11 @@ public final class MediaCas implements AutoCloseable {
		}

		/**
		* Check if the HAL is an AIDL implementation
		* Check if the HAL is an AIDL implementation. For CTS testing purpose.
		*
		* @hide
		*/
		@TestApi
		public boolean isAidlHal() {
		return mICas != null;
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.media;

		import android.annotation.NonNull;
		import android.annotation.TestApi;
		import android.hardware.cas.IDescrambler;
		import android.hardware.cas.ScramblingControl;
		import android.hardware.cas.V1_0.IDescramblerBase;
		@@ -221,10 +222,11 @@ public final class MediaDescrambler implements AutoCloseable {
		}

		/**
		* Check if the underlying HAL is AIDL. Used only for CTS.
		* Check if the underlying HAL is AIDL. For CTS testing purpose.
		*
		* @hide
		*/
		@TestApi
		public boolean isAidlHal() {
		return mIsAidlHal;
		}