Merge "Unhide Session2Command" (4900d0e4) · Commits · e / os / android_frameworks_base

api/current.txt

+21 −0

Original line number	Diff line number	Diff line
		@@ -26076,6 +26076,27 @@ package android.media {
		field public static final int URI_COLUMN_INDEX = 2; // 0x2
		}

		public final class Session2Command implements android.os.Parcelable {
		ctor public Session2Command(int);
		ctor public Session2Command(java.lang.String, android.os.Bundle);
		method public int describeContents();
		method public int getCommandCode();
		method public java.lang.String getCustomCommand();
		method public android.os.Bundle getExtras();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final int COMMAND_CODE_CUSTOM = 0; // 0x0
		field public static final android.os.Parcelable.Creator<android.media.Session2Command> CREATOR;
		field public static final int RESULT_ERROR_UNKNOWN_ERROR = -1; // 0xffffffff
		field public static final int RESULT_INFO_SKIPPED = 1; // 0x1
		field public static final int RESULT_SUCCESS = 0; // 0x0
		}

		public static final class Session2Command.Result {
		ctor public Session2Command.Result(int, android.os.Bundle);
		method public int getResultCode();
		method public android.os.Bundle getResultData();
		}

		public class SoundPool {
		ctor public deprecated SoundPool(int, int, int);
		method public final void autoPause();

+7 −5

Original line number	Diff line number	Diff line
		@@ -36,8 +36,6 @@ import java.util.Objects;
		* Use the <a href="{@docRoot}jetpack/androidx.html">AndroidX</a>
		* <a href="{@docRoot}reference/androidx/media2/package-summary.html">Media2 Library</a>
		* for consistent behavior across all devices.
		* </p>
		* @hide
		*/
		public final class Session2Command implements Parcelable {
		/**
		@@ -151,14 +149,17 @@ public final class Session2Command implements Parcelable {
		}

		@Override
		public void writeToParcel(Parcel dest, int flags) {
		public void writeToParcel(@NonNull Parcel dest, int flags) {
		if (dest == null) {
		throw new IllegalArgumentException("parcel shouldn't be null");
		}
		dest.writeInt(mCommandCode);
		dest.writeString(mCustomCommand);
		dest.writeBundle(mExtras);
		}

		@Override
		public boolean equals(Object obj) {
		public boolean equals(@Nullable Object obj) {
		if (!(obj instanceof Session2Command)) {
		return false;
		}
		@@ -185,7 +186,7 @@ public final class Session2Command implements Parcelable {
		* @param resultCode result code
		* @param resultData result data
		*/
		public Result(int resultCode, Bundle resultData) {
		public Result(int resultCode, @Nullable Bundle resultData) {
		mResultCode = resultCode;
		mResultData = resultData;
		}
		@@ -200,6 +201,7 @@ public final class Session2Command implements Parcelable {
		/**
		* Returns the result data.
		*/
		@Nullable
		public Bundle getResultData() {
		return mResultData;
		}