Make change and version bump to r_aml_300802200 for mainline module file:... (71310bb9) · Commits · e / os / android_frameworks_base

apex/extservices/apex_manifest.json

+1 −1

Original line number	Original line	Diff line number	Diff line
	{		{
	"name": "com.android.extservices",		"name": "com.android.extservices",
	"version": 300802100		"version": 300802200
	}		}

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

+62 −0

Original line number	Original line	Diff line number	Diff line
	@@ -31,6 +31,7 @@ import com.google.android.exoplayer2.C;
	import com.google.android.exoplayer2.Format;		import com.google.android.exoplayer2.Format;
	import com.google.android.exoplayer2.ParserException;		import com.google.android.exoplayer2.ParserException;
	import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;		import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
			import com.google.android.exoplayer2.extractor.ChunkIndex;
	import com.google.android.exoplayer2.extractor.DefaultExtractorInput;		import com.google.android.exoplayer2.extractor.DefaultExtractorInput;
	import com.google.android.exoplayer2.extractor.Extractor;		import com.google.android.exoplayer2.extractor.Extractor;
	import com.google.android.exoplayer2.extractor.ExtractorInput;		import com.google.android.exoplayer2.extractor.ExtractorInput;
	@@ -817,6 +818,30 @@ public final class MediaParser {
	public static final String PARAMETER_EXPOSE_DUMMY_SEEKMAP =		public static final String PARAMETER_EXPOSE_DUMMY_SEEKMAP =
	"android.media.mediaparser.exposeDummySeekMap";		"android.media.mediaparser.exposeDummySeekMap";

			/**
			* Sets whether chunk indices available in the extracted media should be exposed as {@link
			* MediaFormat MediaFormats}. {@code boolean} expected. Default value is {@link false}.
			*
			* <p>When set to true, any information about media segmentation will be exposed as a {@link
			* MediaFormat} (with track index 0) containing four {@link ByteBuffer} elements under the
			* following keys:
			*
			* <ul>
			* <li>"chunk-index-int-sizes": Contains {@code ints} representing the sizes in bytes of each
			* of the media segments.
			* <li>"chunk-index-long-offsets": Contains {@code longs} representing the byte offsets of
			* each segment in the stream.
			* <li>"chunk-index-long-us-durations": Contains {@code longs} representing the media duration
			* of each segment, in microseconds.
			* <li>"chunk-index-long-us-times": Contains {@code longs} representing the start time of each
			* segment, in microseconds.
			* </ul>
			*
			* @hide
			*/
			public static final String PARAMETER_EXPOSE_CHUNK_INDEX_AS_MEDIA_FORMAT =
			"android.media.mediaParser.exposeChunkIndexAsMediaFormat";

	// Private constants.		// Private constants.

	private static final String TAG = "MediaParser";		private static final String TAG = "MediaParser";
	@@ -980,6 +1005,7 @@ public final class MediaParser {
	private boolean mIgnoreTimestampOffset;		private boolean mIgnoreTimestampOffset;
	private boolean mEagerlyExposeTrackType;		private boolean mEagerlyExposeTrackType;
	private boolean mExposeDummySeekMap;		private boolean mExposeDummySeekMap;
			private boolean mExposeChunkIndexAsMediaFormat;
	private String mParserName;		private String mParserName;
	private Extractor mExtractor;		private Extractor mExtractor;
	private ExtractorInput mExtractorInput;		private ExtractorInput mExtractorInput;
	@@ -1042,6 +1068,9 @@ public final class MediaParser {
	if (PARAMETER_EXPOSE_DUMMY_SEEKMAP.equals(parameterName)) {		if (PARAMETER_EXPOSE_DUMMY_SEEKMAP.equals(parameterName)) {
	mExposeDummySeekMap = (boolean) value;		mExposeDummySeekMap = (boolean) value;
	}		}
			if (PARAMETER_EXPOSE_CHUNK_INDEX_AS_MEDIA_FORMAT.equals(parameterName)) {
			mExposeChunkIndexAsMediaFormat = (boolean) value;
			}
	mParserParameters.put(parameterName, value);		mParserParameters.put(parameterName, value);
	return this;		return this;
	}		}
	@@ -1436,6 +1465,19 @@ public final class MediaParser {

	@Override		@Override
	public void seekMap(com.google.android.exoplayer2.extractor.SeekMap exoplayerSeekMap) {		public void seekMap(com.google.android.exoplayer2.extractor.SeekMap exoplayerSeekMap) {
			if (mExposeChunkIndexAsMediaFormat && exoplayerSeekMap instanceof ChunkIndex) {
			ChunkIndex chunkIndex = (ChunkIndex) exoplayerSeekMap;
			MediaFormat mediaFormat = new MediaFormat();
			mediaFormat.setByteBuffer("chunk-index-int-sizes", toByteBuffer(chunkIndex.sizes));
			mediaFormat.setByteBuffer(
			"chunk-index-long-offsets", toByteBuffer(chunkIndex.offsets));
			mediaFormat.setByteBuffer(
			"chunk-index-long-us-durations", toByteBuffer(chunkIndex.durationsUs));
			mediaFormat.setByteBuffer(
			"chunk-index-long-us-times", toByteBuffer(chunkIndex.timesUs));
			mOutputConsumer.onTrackDataFound(
			/* trackIndex= / 0, new TrackData(mediaFormat, / drmInitData= */ null));
			}
	mOutputConsumer.onSeekMapFound(new SeekMap(exoplayerSeekMap));		mOutputConsumer.onSeekMapFound(new SeekMap(exoplayerSeekMap));
	}		}
	}		}
	@@ -1823,6 +1865,24 @@ public final class MediaParser {
	return result;		return result;
	}		}

			private static ByteBuffer toByteBuffer(long[] longArray) {
			ByteBuffer byteBuffer = ByteBuffer.allocateDirect(longArray.length * Long.BYTES);
			for (long element : longArray) {
			byteBuffer.putLong(element);
			}
			byteBuffer.flip();
			return byteBuffer;
			}

			private static ByteBuffer toByteBuffer(int[] intArray) {
			ByteBuffer byteBuffer = ByteBuffer.allocateDirect(intArray.length * Integer.BYTES);
			for (int element : intArray) {
			byteBuffer.putInt(element);
			}
			byteBuffer.flip();
			return byteBuffer;
			}

	private static String toTypeString(int type) {		private static String toTypeString(int type) {
	switch (type) {		switch (type) {
	case C.TRACK_TYPE_VIDEO:		case C.TRACK_TYPE_VIDEO:
	@@ -1979,6 +2039,8 @@ public final class MediaParser {
	expectedTypeByParameterName.put(PARAMETER_IGNORE_TIMESTAMP_OFFSET, Boolean.class);		expectedTypeByParameterName.put(PARAMETER_IGNORE_TIMESTAMP_OFFSET, Boolean.class);
	expectedTypeByParameterName.put(PARAMETER_EAGERLY_EXPOSE_TRACKTYPE, Boolean.class);		expectedTypeByParameterName.put(PARAMETER_EAGERLY_EXPOSE_TRACKTYPE, Boolean.class);
	expectedTypeByParameterName.put(PARAMETER_EXPOSE_DUMMY_SEEKMAP, Boolean.class);		expectedTypeByParameterName.put(PARAMETER_EXPOSE_DUMMY_SEEKMAP, Boolean.class);
			expectedTypeByParameterName.put(
			PARAMETER_EXPOSE_CHUNK_INDEX_AS_MEDIA_FORMAT, Boolean.class);
	EXPECTED_TYPE_BY_PARAMETER_NAME = Collections.unmodifiableMap(expectedTypeByParameterName);		EXPECTED_TYPE_BY_PARAMETER_NAME = Collections.unmodifiableMap(expectedTypeByParameterName);
	}		}
	}		}

apex/permission/apex_manifest.json

+1 −1

Original line number	Original line	Diff line number	Diff line
	{		{
	"name": "com.android.permission",		"name": "com.android.permission",
	"version": 300802100		"version": 300802200
	}		}

apex/statsd/apex_manifest.json

+1 −1

Original line number	Original line	Diff line number	Diff line
	{		{
	"name": "com.android.os.statsd",		"name": "com.android.os.statsd",
	"version": 300802100		"version": 300802200
	}		}

config/preloaded-classes-blacklist

+3 −1

Original line number	Original line	Diff line number	Diff line
	android.content.AsyncTaskLoader$LoadTask		android.content.AsyncTaskLoader$LoadTask
	android.net.ConnectivityThread$Singleton		android.net.ConnectivityThread$Singleton
			android.os.AsyncTask
	android.os.FileObserver		android.os.FileObserver
			android.os.NullVibrator
	android.speech.tts.TextToSpeech$Connection$SetupConnectionAsyncTask		android.speech.tts.TextToSpeech$Connection$SetupConnectionAsyncTask
	android.widget.Magnifier		android.widget.Magnifier
	sun.nio.fs.UnixChannelFactory		com.android.server.BootReceiver$2