Merge "Fix editing ended event API" into main (4ee4e6bc) · Commits · e / os / android_frameworks_base

core/api/current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -25790,6 +25790,7 @@ package android.media.metrics {
		field public static final int FINAL_STATE_CANCELED = 2; // 0x2
		field public static final int FINAL_STATE_ERROR = 3; // 0x3
		field public static final int FINAL_STATE_SUCCEEDED = 1; // 0x1
		field public static final int TIME_SINCE_CREATED_UNKNOWN = -1; // 0xffffffff
		}

		@FlaggedApi("com.android.media.editing.flags.add_media_metrics_editing") public static final class EditingEndedEvent.Builder {
		@@ -25797,7 +25798,7 @@ package android.media.metrics {
		method @NonNull public android.media.metrics.EditingEndedEvent build();
		method @NonNull public android.media.metrics.EditingEndedEvent.Builder setErrorCode(int);
		method @NonNull public android.media.metrics.EditingEndedEvent.Builder setMetricsBundle(@NonNull android.os.Bundle);
		method @NonNull public android.media.metrics.EditingEndedEvent.Builder setTimeSinceCreatedMillis(@IntRange(from=0xffffffff) long);
		method @NonNull public android.media.metrics.EditingEndedEvent.Builder setTimeSinceCreatedMillis(@IntRange(from=android.media.metrics.EditingEndedEvent.TIME_SINCE_CREATED_UNKNOWN) long);
		}

		public final class EditingSession implements java.lang.AutoCloseable {

media/java/android/media/metrics/EditingEndedEvent.java

+15 −9

Original line number	Diff line number	Diff line
		@@ -86,7 +86,10 @@ public final class EditingEndedEvent extends Event implements Parcelable {
		*/
		public static final int ERROR_CODE_IO_NO_PERMISSION = 8;

		/** */
		/**
		* Caused by failing to load data via cleartext HTTP, when the app's network security
		* configuration does not permit it.
		*/
		public static final int ERROR_CODE_IO_CLEARTEXT_NOT_PERMITTED = 9;

		/** Caused by reading data out of the data bounds. */
		@@ -146,6 +149,9 @@ public final class EditingEndedEvent extends Event implements Parcelable {
		@Retention(java.lang.annotation.RetentionPolicy.SOURCE)
		public @interface ErrorCode {}

		/** Special value for unknown {@linkplain #getTimeSinceCreatedMillis() time since creation}. */
		public static final int TIME_SINCE_CREATED_UNKNOWN = -1;

		private final @ErrorCode int mErrorCode;
		@SuppressWarnings("HidingField") // Hiding field from superclass as for playback events.
		private final long mTimeSinceCreatedMillis;
		@@ -174,16 +180,16 @@ public final class EditingEndedEvent extends Event implements Parcelable {
		}

		/**
		* Gets the elapsed time since creating of the editing session, in milliseconds, or -1 if
		* unknown.
		* Gets the elapsed time since creating of the editing session, in milliseconds, or {@link
		* #TIME_SINCE_CREATED_UNKNOWN} if unknown.
		*
		* @return The elapsed time since creating the editing session, in milliseconds, or -1 if
		* unknown.
		* @return The elapsed time since creating the editing session, in milliseconds, or {@link
		* #TIME_SINCE_CREATED_UNKNOWN} if unknown.
		* @see LogSessionId
		* @see EditingSession
		*/
		@Override
		@IntRange(from = -1)
		@IntRange(from = TIME_SINCE_CREATED_UNKNOWN)
		public long getTimeSinceCreatedMillis() {
		return mTimeSinceCreatedMillis;
		}
		@@ -283,7 +289,7 @@ public final class EditingEndedEvent extends Event implements Parcelable {
		public Builder(@FinalState int finalState) {
		mFinalState = finalState;
		mErrorCode = ERROR_CODE_NONE;
		mTimeSinceCreatedMillis = -1;
		mTimeSinceCreatedMillis = TIME_SINCE_CREATED_UNKNOWN;
		mMetricsBundle = new Bundle();
		}

		@@ -291,11 +297,11 @@ public final class EditingEndedEvent extends Event implements Parcelable {
		* Sets the elapsed time since creating the editing session, in milliseconds.
		*
		* @param timeSinceCreatedMillis The elapsed time since creating the editing session, in
		* milliseconds, or -1 if the value is unknown.
		* milliseconds, or {@link #TIME_SINCE_CREATED_UNKNOWN} if unknown.
		* @see #getTimeSinceCreatedMillis()
		*/
		public @NonNull Builder setTimeSinceCreatedMillis(
		@IntRange(from = -1) long timeSinceCreatedMillis) {
		@IntRange(from = TIME_SINCE_CREATED_UNKNOWN) long timeSinceCreatedMillis) {
		mTimeSinceCreatedMillis = timeSinceCreatedMillis;
		return this;
		}