From cf89089bfae79fd243bddd968bfd54c3ed92bff1 Mon Sep 17 00:00:00 2001
From: Jin Seok Park <jinpark@google.com>
Date: Mon, 18 Mar 2019 22:56:42 +0900
Subject: [PATCH] Remove Session2CommandGroup.Builder methods

Remove Session2CommandGroup.Builder#addCommand(int)
and Session2CommandGroup.Builder#removeCommand(int)
methods.

Bug: 128459284
Test: update-api
Change-Id: I15d52188a7b74919af40f1f11feae0a88828cadd
---
 api/current.txt                               |  2 --
 .../android/media/Session2CommandGroup.java   | 31 -------------------
 2 files changed, 33 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 63ca6da38c96b..a891a29295346 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -26386,10 +26386,8 @@ package android.media {
     ctor public Session2CommandGroup.Builder();
     ctor public Session2CommandGroup.Builder(@NonNull android.media.Session2CommandGroup);
     method @NonNull public android.media.Session2CommandGroup.Builder addCommand(@NonNull android.media.Session2Command);
-    method @NonNull public android.media.Session2CommandGroup.Builder addCommand(int);
     method @NonNull public android.media.Session2CommandGroup build();
     method @NonNull public android.media.Session2CommandGroup.Builder removeCommand(@NonNull android.media.Session2Command);
-    method @NonNull public android.media.Session2CommandGroup.Builder removeCommand(int);
   }
 
   public final class Session2Token implements android.os.Parcelable {
diff --git a/media/apex/java/android/media/Session2CommandGroup.java b/media/apex/java/android/media/Session2CommandGroup.java
index 73a59d00ae344..06ae8737fdc07 100644
--- a/media/apex/java/android/media/Session2CommandGroup.java
+++ b/media/apex/java/android/media/Session2CommandGroup.java
@@ -166,22 +166,6 @@ public final class Session2CommandGroup implements Parcelable {
             return this;
         }
 
-        /**
-         * Adds a predefined command with given {@code commandCode} to this command group.
-         *
-         * @param commandCode A command code to add.
-         *                    Shouldn't be {@link Session2Command#COMMAND_CODE_CUSTOM}.
-         */
-        @NonNull
-        public Builder addCommand(int commandCode) {
-            if (commandCode == COMMAND_CODE_CUSTOM) {
-                throw new IllegalArgumentException(
-                        "Use addCommand(Session2Command) for COMMAND_CODE_CUSTOM.");
-            }
-            mCommands.add(new Session2Command(commandCode));
-            return this;
-        }
-
         /**
          * Removes a command from this group which matches given {@code command}.
          *
@@ -196,21 +180,6 @@ public final class Session2CommandGroup implements Parcelable {
             return this;
         }
 
-        /**
-         * Removes a command from this group which matches given {@code commandCode}.
-         *
-         * @param commandCode A command code to find.
-         *                    Shouldn't be {@link Session2Command#COMMAND_CODE_CUSTOM}.
-         */
-        @NonNull
-        public Builder removeCommand(int commandCode) {
-            if (commandCode == COMMAND_CODE_CUSTOM) {
-                throw new IllegalArgumentException("commandCode shouldn't be COMMAND_CODE_CUSTOM");
-            }
-            mCommands.remove(new Session2Command(commandCode));
-            return this;
-        }
-
         /**
          * Builds {@link Session2CommandGroup}.
          *