Snap for 6456462 from 0a773fe2d4258004600a0f5f24ee5f2c0e76cba3 to mainline-release (1724263e) · Commits · e / os / android_frameworks_base

ApiDocs.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -101,7 +101,7 @@ droidstubs {
		arg_files: [
		"core/res/AndroidManifest.xml",
		],
		args: metalava_framework_docs_args + " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS,process=android.annotation.SystemApi.Process.ALL\\) ",
		args: metalava_framework_docs_args + " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) ",
		write_sdk_values: true,
		}

apex/blobstore/framework/java/android/app/blob/BlobStoreManager.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -307,8 +307,8 @@ public class BlobStoreManager {
		* {@link #getRemainingLeaseQuotaBytes()} before trying to
		* acquire a lease.
		*
		* @see {@link #acquireLease(BlobHandle, int)}
		* @see {@link #acquireLease(BlobHandle, CharSequence)}
		* @see #acquireLease(BlobHandle, int)
		* @see #acquireLease(BlobHandle, CharSequence)
		*/
		public void acquireLease(@NonNull BlobHandle blobHandle, @IdRes int descriptionResId,
		@CurrentTimeMillisLong long leaseExpiryTimeMillis) throws IOException {
		@@ -367,8 +367,8 @@ public class BlobStoreManager {
		* {@link #getRemainingLeaseQuotaBytes()} before trying to
		* acquire a lease.
		*
		* @see {@link #acquireLease(BlobHandle, int, long)}
		* @see {@link #acquireLease(BlobHandle, CharSequence)}
		* @see #acquireLease(BlobHandle, int, long)
		* @see #acquireLease(BlobHandle, CharSequence)
		*/
		public void acquireLease(@NonNull BlobHandle blobHandle, @NonNull CharSequence description,
		@CurrentTimeMillisLong long leaseExpiryTimeMillis) throws IOException {
		@@ -420,8 +420,8 @@ public class BlobStoreManager {
		* {@link #getRemainingLeaseQuotaBytes()} before trying to
		* acquire a lease.
		*
		* @see {@link #acquireLease(BlobHandle, int, long)}
		* @see {@link #acquireLease(BlobHandle, CharSequence, long)}
		* @see #acquireLease(BlobHandle, int, long)
		* @see #acquireLease(BlobHandle, CharSequence, long)
		*/
		public void acquireLease(@NonNull BlobHandle blobHandle, @IdRes int descriptionResId)
		throws IOException {
		@@ -467,8 +467,8 @@ public class BlobStoreManager {
		* {@link #getRemainingLeaseQuotaBytes()} before trying to
		* acquire a lease.
		*
		* @see {@link #acquireLease(BlobHandle, int)}
		* @see {@link #acquireLease(BlobHandle, CharSequence, long)}
		* @see #acquireLease(BlobHandle, int)
		* @see #acquireLease(BlobHandle, CharSequence, long)
		*/
		public void acquireLease(@NonNull BlobHandle blobHandle, @NonNull CharSequence description)
		throws IOException {

apex/jobscheduler/framework/java/android/app/job/JobScheduler.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ import java.util.List;
		* system will execute this job on your application's {@link android.app.job.JobService}.
		* You identify the service component that implements the logic for your job when you
		* construct the JobInfo using
		* {@link android.app.job.JobInfo.Builder#JobInfo.Builder(int,android.content.ComponentName)}.
		* {@link android.app.job.JobInfo.Builder#Builder(int,android.content.ComponentName)}.
		* </p>
		* <p>
		* The framework will be intelligent about when it executes jobs, and attempt to batch
		@@ -153,7 +153,7 @@ public abstract class JobScheduler {
		* method is ignored.
		*
		* @param jobId unique identifier for the job to be canceled, as supplied to
		* {@link JobInfo.Builder#JobInfo.Builder(int, android.content.ComponentName)
		* {@link JobInfo.Builder#Builder(int, android.content.ComponentName)
		* JobInfo.Builder(int, android.content.ComponentName)}.
		*/
		public abstract void cancel(int jobId);

apex/media/framework/Android.bp

+5 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ java_library {
		"com.android.media",
		"test_com.android.media",
		],
		min_sdk_version: "29",
		}

		filegroup {
		@@ -92,6 +93,7 @@ stubs_defaults {
		// TODO(b/135922046) remove this
		include_dirs: ["frameworks/base/core/java"],
		},
		dist: { dest: "framework-media.txt" },
		}

		droidstubs {
		@@ -130,18 +132,21 @@ java_library {
		name: "framework-media-stubs-publicapi",
		srcs: [":framework-media-stubs-srcs-publicapi"],
		defaults: ["framework-module-stubs-lib-defaults-publicapi"],
		dist: { dest: "framework-media.jar" },
		}

		java_library {
		name: "framework-media-stubs-systemapi",
		srcs: [":framework-media-stubs-srcs-systemapi"],
		defaults: ["framework-module-stubs-lib-defaults-systemapi"],
		dist: { dest: "framework-media.jar" },
		}

		java_library {
		name: "framework-media-stubs-module_libs_api",
		srcs: [":framework-media-stubs-srcs-module_libs_api"],
		defaults: ["framework-module-stubs-lib-defaults-module_libs_api"],
		dist: { dest: "framework-media.jar" },
		}

		java_library {

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -1288,7 +1288,11 @@ public final class MediaParser {
		}

		@Override
		public int sampleData(DataReader input, int length, boolean allowEndOfInput)
		public int sampleData(
		DataReader input,
		int length,
		boolean allowEndOfInput,
		@SampleDataPart int sampleDataPart)
		throws IOException {
		mScratchDataReaderAdapter.setDataReader(input, length);
		long positionBeforeReading = mScratchDataReaderAdapter.getPosition();
		@@ -1297,7 +1301,8 @@ public final class MediaParser {
		}

		@Override
		public void sampleData(ParsableByteArray data, int length) {
		public void sampleData(
		ParsableByteArray data, int length, @SampleDataPart int sampleDataPart) {
		mScratchParsableByteArrayAdapter.resetWithByteArray(data, length);
		try {
		mOutputConsumer.onSampleDataFound(mTrackIndex, mScratchParsableByteArrayAdapter);