Merge "Change session ID string to ID object" into sc-dev (624a0f2d) · Commits · e / os / android_frameworks_base

apex/media/framework/api/current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -69,10 +69,12 @@ package android.media {
	method public boolean advance(@NonNull android.media.MediaParser.SeekableInputReader) throws java.io.IOException;		method public boolean advance(@NonNull android.media.MediaParser.SeekableInputReader) throws java.io.IOException;
	method @NonNull public static android.media.MediaParser create(@NonNull android.media.MediaParser.OutputConsumer, @NonNull java.lang.String...);		method @NonNull public static android.media.MediaParser create(@NonNull android.media.MediaParser.OutputConsumer, @NonNull java.lang.String...);
	method @NonNull public static android.media.MediaParser createByName(@NonNull String, @NonNull android.media.MediaParser.OutputConsumer);		method @NonNull public static android.media.MediaParser createByName(@NonNull String, @NonNull android.media.MediaParser.OutputConsumer);
			method @NonNull public android.media.metrics.LogSessionId getLogSessionId();
	method @NonNull public String getParserName();		method @NonNull public String getParserName();
	method @NonNull public static java.util.List<java.lang.String> getParserNames(@NonNull android.media.MediaFormat);		method @NonNull public static java.util.List<java.lang.String> getParserNames(@NonNull android.media.MediaFormat);
	method public void release();		method public void release();
	method public void seek(@NonNull android.media.MediaParser.SeekPoint);		method public void seek(@NonNull android.media.MediaParser.SeekPoint);
			method public void setLogSessionId(@NonNull android.media.metrics.LogSessionId);
	method @NonNull public android.media.MediaParser setParameter(@NonNull String, @NonNull Object);		method @NonNull public android.media.MediaParser setParameter(@NonNull String, @NonNull Object);
	method public boolean supportsParameter(@NonNull String);		method public boolean supportsParameter(@NonNull String);
	field public static final String PARAMETER_ADTS_ENABLE_CBR_SEEKING = "android.media.mediaparser.adts.enableCbrSeeking";		field public static final String PARAMETER_ADTS_ENABLE_CBR_SEEKING = "android.media.mediaparser.adts.enableCbrSeeking";

apex/media/framework/java/android/media/MediaParser.java

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.annotation.StringDef;		import android.annotation.StringDef;
	import android.media.MediaCodec.CryptoInfo;		import android.media.MediaCodec.CryptoInfo;
			import android.media.metrics.LogSessionId;
	import android.os.Build;		import android.os.Build;
	import android.text.TextUtils;		import android.text.TextUtils;
	import android.util.Log;		import android.util.Log;
	@@ -74,6 +75,7 @@ import java.util.HashMap;
	import java.util.LinkedHashMap;		import java.util.LinkedHashMap;
	import java.util.List;		import java.util.List;
	import java.util.Map;		import java.util.Map;
			import java.util.Objects;
	import java.util.UUID;		import java.util.UUID;
	import java.util.concurrent.ThreadLocalRandom;		import java.util.concurrent.ThreadLocalRandom;
	import java.util.function.Function;		import java.util.function.Function;
	@@ -1066,6 +1068,7 @@ public final class MediaParser {
	private boolean mReleased;		private boolean mReleased;

	// MediaMetrics fields.		// MediaMetrics fields.
			@NonNull private LogSessionId mLogSessionId = LogSessionId.LOG_SESSION_ID_NONE;
	private final boolean mCreatedByName;		private final boolean mCreatedByName;
	private final SparseArray<Format> mTrackFormats;		private final SparseArray<Format> mTrackFormats;
	private String mLastObservedExceptionName;		private String mLastObservedExceptionName;
	@@ -1328,6 +1331,7 @@ public final class MediaParser {
	MEDIAMETRICS_PARAMETER_LIST_MAX_LENGTH));		MEDIAMETRICS_PARAMETER_LIST_MAX_LENGTH));

	nativeSubmitMetrics(		nativeSubmitMetrics(
			// TODO: mLogSessionId,
	mParserName,		mParserName,
	mCreatedByName,		mCreatedByName,
	String.join(MEDIAMETRICS_ELEMENT_SEPARATOR, mParserNamesPool),		String.join(MEDIAMETRICS_ELEMENT_SEPARATOR, mParserNamesPool),
	@@ -1341,6 +1345,15 @@ public final class MediaParser {
	videoHeight);		videoHeight);
	}		}

			public void setLogSessionId(@NonNull LogSessionId sessionId) {
			this.mLogSessionId = Objects.requireNonNull(sessionId);
			}

			@NonNull
			public LogSessionId getLogSessionId() {
			return mLogSessionId;
			}

	// Private methods.		// Private methods.

	private MediaParser(		private MediaParser(
	@@ -2184,6 +2197,7 @@ public final class MediaParser {
	// Native methods.		// Native methods.

	private native void nativeSubmitMetrics(		private native void nativeSubmitMetrics(
			// TODO: String logSessionId,
	String parserName,		String parserName,
	boolean createdByName,		boolean createdByName,
	String parserPool,		String parserPool,

core/api/current.txt

+17 −9

core/api/test-current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1478,7 +1478,7 @@ package android.media.audiopolicy {
	package android.media.metrics {		package android.media.metrics {

	public final class LogSessionId {		public final class LogSessionId {
	method @NonNull public String getStringId();		ctor public LogSessionId(@NonNull String);
	}		}

	}		}

media/java/android/media/AudioRecord.java

+22 −11

Original line number	Original line	Diff line number	Diff line
	@@ -32,6 +32,7 @@ import android.content.Context;
	import android.media.MediaRecorder.Source;		import android.media.MediaRecorder.Source;
	import android.media.audiopolicy.AudioMix;		import android.media.audiopolicy.AudioMix;
	import android.media.audiopolicy.AudioPolicy;		import android.media.audiopolicy.AudioPolicy;
			import android.media.metrics.LogSessionId;
	import android.media.permission.Identity;		import android.media.permission.Identity;
	import android.media.projection.MediaProjection;		import android.media.projection.MediaProjection;
	import android.os.Binder;		import android.os.Binder;
	@@ -282,9 +283,9 @@ public class AudioRecord implements AudioRouting, MicrophoneDirection,

	/**		/**
	* The log session id used for metrics.		* The log session id used for metrics.
	* A null or empty string here means it is not set.		* {@link LogSessionId#LOG_SESSION_ID_NONE} here means it is not set.
	*/		*/
	private String mLogSessionId;		@NonNull private LogSessionId mLogSessionId = LogSessionId.LOG_SESSION_ID_NONE;

	//---------------------------------------------------------		//---------------------------------------------------------
	// Constructor, Finalize		// Constructor, Finalize
	@@ -1963,24 +1964,34 @@ public class AudioRecord implements AudioRouting, MicrophoneDirection,
	}		}

	/**		/**
	* Sets a string handle to this AudioRecord for metrics collection.		* Sets a {@link LogSessionId} instance to this AudioRecord for metrics collection.
	*		*
	* @param logSessionId a string which is used to identify this object		* @param logSessionId a {@link LogSessionId} instance which is used to
	* to the metrics service. Proper generated Ids must be obtained		* identify this object to the metrics service. Proper generated
	* from the Java metrics service and should be considered opaque.		* Ids must be obtained from the Java metrics service and should
	* Use null to remove the logSessionId association.		* be considered opaque. Use
			* {@link LogSessionId#LOG_SESSION_ID_NONE} to remove the
			* logSessionId association.
	* @throws IllegalStateException if AudioRecord not initialized.		* @throws IllegalStateException if AudioRecord not initialized.
	*
	* @hide
	*/		*/
	public void setLogSessionId(@Nullable String logSessionId) {		public void setLogSessionId(@NonNull LogSessionId logSessionId) {
			Objects.requireNonNull(logSessionId);
	if (mState == STATE_UNINITIALIZED) {		if (mState == STATE_UNINITIALIZED) {
	throw new IllegalStateException("AudioRecord not initialized");		throw new IllegalStateException("AudioRecord not initialized");
	}		}
	native_setLogSessionId(logSessionId);		String stringId = logSessionId.getStringId();
			native_setLogSessionId(stringId);
	mLogSessionId = logSessionId;		mLogSessionId = logSessionId;
	}		}

			/**
			* Returns the {@link LogSessionId}.
			*/
			@NonNull
			public LogSessionId getLogSessionId() {
			return mLogSessionId;
			}

	//---------------------------------------------------------		//---------------------------------------------------------
	// Interface definitions		// Interface definitions
	//--------------------		//--------------------