Merge "Unhide Session2CommandGroup" (fc02cf7f) · Commits · e / os / android_frameworks_base

api/current.txt

+19 −0

Original line number	Diff line number	Diff line
		@@ -26099,6 +26099,25 @@ package android.media {
		method public android.os.Bundle getResultData();
		}

		public final class Session2CommandGroup implements android.os.Parcelable {
		method public int describeContents();
		method public java.util.Set<android.media.Session2Command> getCommands();
		method public boolean hasCommand(android.media.Session2Command);
		method public boolean hasCommand(int);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.media.Session2CommandGroup> CREATOR;
		}

		public static final class Session2CommandGroup.Builder {
		ctor public Session2CommandGroup.Builder();
		ctor public Session2CommandGroup.Builder(android.media.Session2CommandGroup);
		method public android.media.Session2CommandGroup.Builder addCommand(android.media.Session2Command);
		method public android.media.Session2CommandGroup.Builder addCommand(int);
		method public android.media.Session2CommandGroup build();
		method public android.media.Session2CommandGroup.Builder removeCommand(android.media.Session2Command);
		method public android.media.Session2CommandGroup.Builder removeCommand(int);
		}

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

media/java/android/media/MediaSession2.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -250,7 +250,8 @@ public class MediaSession2 implements AutoCloseable {
		if (controllerInfo.mAllowedCommands == null) {
		// For trusted apps, send non-null allowed commands to keep
		// connection.
		controllerInfo.mAllowedCommands = new Session2CommandGroup();
		controllerInfo.mAllowedCommands =
		new Session2CommandGroup.Builder().build();
		}
		if (DEBUG) {
		Log.d(TAG, "Accepting connection: " + controllerInfo);

media/java/android/media/Session2CommandGroup.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ import java.util.Set;
		* <a href="{@docRoot}reference/androidx/media2/package-summary.html">Media2 Library</a>
		* for consistent behavior across all devices.
		* </p>
		* @hide
		*/
		public final class Session2CommandGroup implements Parcelable {
		private static final String TAG = "Session2CommandGroup";
		@@ -55,17 +54,12 @@ public final class Session2CommandGroup implements Parcelable {

		Set<Session2Command> mCommands = new HashSet<>();

		/**
		* Default Constructor.
		*/
		public Session2CommandGroup() {}

		/**
		* Creates a new Session2CommandGroup with commands copied from another object.
		*
		* @param commands The collection of commands to copy.
		*/
		public Session2CommandGroup(@Nullable Collection<Session2Command> commands) {
		Session2CommandGroup(@Nullable Collection<Session2Command> commands) {
		if (commands != null) {
		mCommands.addAll(commands);
		}
		@@ -129,7 +123,10 @@ public final class Session2CommandGroup 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.writeParcelableArray(mCommands.toArray(new Session2Command[0]), 0);
		}

		@@ -149,6 +146,9 @@ public final class Session2CommandGroup implements Parcelable {
		* @param commandGroup
		*/
		public Builder(@NonNull Session2CommandGroup commandGroup) {
		if (commandGroup == null) {
		throw new IllegalArgumentException("command group shouldn't be null");
		}
		mCommands = commandGroup.getCommands();
		}