diff --git a/api/current.txt b/api/current.txt index c95fad544d2c6..25cc5faeac351 100644 --- a/api/current.txt +++ b/api/current.txt @@ -36006,6 +36006,7 @@ package android.telecom { method public void registerCallback(android.telecom.Call.Callback, android.os.Handler); method public void reject(boolean, java.lang.String); method public final void removeExtras(java.util.List); + method public final void removeExtras(java.lang.String...); method public void sendCallEvent(java.lang.String, android.os.Bundle); method public void splitFromConference(); method public void stopDtmfTone(); @@ -36159,6 +36160,7 @@ package android.telecom { method public final void putExtras(android.os.Bundle); method public final void removeConnection(android.telecom.Connection); method public final void removeExtras(java.util.List); + method public final void removeExtras(java.lang.String...); method public final void setActive(); method public final void setConferenceableConnections(java.util.List); method public final void setConnectionCapabilities(int); @@ -36219,6 +36221,7 @@ package android.telecom { method public static java.lang.String propertiesToString(int); method public final void putExtras(android.os.Bundle); method public final void removeExtras(java.util.List); + method public final void removeExtras(java.lang.String...); method public void sendConnectionEvent(java.lang.String, android.os.Bundle); method public final void setActive(); method public final void setAddress(android.net.Uri, int); diff --git a/api/system-current.txt b/api/system-current.txt index 29062cd9bfcd5..756e1866a1c47 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -38835,6 +38835,7 @@ package android.telecom { method public void registerCallback(android.telecom.Call.Callback, android.os.Handler); method public void reject(boolean, java.lang.String); method public final void removeExtras(java.util.List); + method public final void removeExtras(java.lang.String...); method public deprecated void removeListener(android.telecom.Call.Listener); method public void sendCallEvent(java.lang.String, android.os.Bundle); method public void splitFromConference(); @@ -38998,6 +38999,7 @@ package android.telecom { method public final void putExtras(android.os.Bundle); method public final void removeConnection(android.telecom.Connection); method public final void removeExtras(java.util.List); + method public final void removeExtras(java.lang.String...); method public final void setActive(); method public final void setConferenceableConnections(java.util.List); method public final deprecated void setConnectTimeMillis(long); @@ -39061,6 +39063,7 @@ package android.telecom { method public static java.lang.String propertiesToString(int); method public final void putExtras(android.os.Bundle); method public final void removeExtras(java.util.List); + method public final void removeExtras(java.lang.String...); method public void sendConnectionEvent(java.lang.String, android.os.Bundle); method public final void setActive(); method public final void setAddress(android.net.Uri, int); diff --git a/api/test-current.txt b/api/test-current.txt index 26ef387430380..6d6911dcdea56 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -36083,6 +36083,7 @@ package android.telecom { method public void registerCallback(android.telecom.Call.Callback, android.os.Handler); method public void reject(boolean, java.lang.String); method public final void removeExtras(java.util.List); + method public final void removeExtras(java.lang.String...); method public void sendCallEvent(java.lang.String, android.os.Bundle); method public void splitFromConference(); method public void stopDtmfTone(); @@ -36236,6 +36237,7 @@ package android.telecom { method public final void putExtras(android.os.Bundle); method public final void removeConnection(android.telecom.Connection); method public final void removeExtras(java.util.List); + method public final void removeExtras(java.lang.String...); method public final void setActive(); method public final void setConferenceableConnections(java.util.List); method public final void setConnectionCapabilities(int); @@ -36296,6 +36298,7 @@ package android.telecom { method public static java.lang.String propertiesToString(int); method public final void putExtras(android.os.Bundle); method public final void removeExtras(java.util.List); + method public final void removeExtras(java.lang.String...); method public void sendConnectionEvent(java.lang.String, android.os.Bundle); method public final void setActive(); method public final void setAddress(android.net.Uri, int); diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java index b4c6e6aefbce0..5557510de1402 100644 --- a/telecomm/java/android/telecom/Call.java +++ b/telecomm/java/android/telecom/Call.java @@ -23,6 +23,7 @@ import android.os.Handler; import java.lang.String; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; @@ -1025,7 +1026,7 @@ public final class Call { } /** - * Adds an integer extra to this {@code Connection}. + * Adds an integer extra to this {@link Call}. * * @param key The extra key. * @param value The value. @@ -1040,7 +1041,7 @@ public final class Call { } /** - * Adds a string extra to this {@code Connection}. + * Adds a string extra to this {@link Call}. * * @param key The extra key. * @param value The value. @@ -1055,7 +1056,7 @@ public final class Call { } /** - * Removes extras from this {@code Connection}. + * Removes extras from this {@link Call}. * * @param keys The keys of the extras to remove. */ @@ -1071,6 +1072,15 @@ public final class Call { mInCallAdapter.removeExtras(mTelecomCallId, keys); } + /** + * Removes extras from this {@link Call}. + * + * @param keys The keys of the extras to remove. + */ + public final void removeExtras(String ... keys) { + removeExtras(Arrays.asList(keys)); + } + /** * Obtains the parent of this {@code Call} in a conference, if any. * diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java index 1ce4ade8241ef..be04c9077f0a9 100644 --- a/telecomm/java/android/telecom/Conference.java +++ b/telecomm/java/android/telecom/Conference.java @@ -24,6 +24,7 @@ import android.telecom.Connection.VideoProvider; import android.util.ArraySet; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Locale; @@ -779,9 +780,9 @@ public abstract class Conference extends Conferenceable { } /** - * Removes an extra from this {@link Conference}. + * Removes extras from this {@link Conference}. * - * @param keys The key of the extra key to remove. + * @param keys The keys of the extras to remove. */ public final void removeExtras(List keys) { if (keys == null || keys.isEmpty()) { @@ -802,6 +803,15 @@ public abstract class Conference extends Conferenceable { } } + /** + * Removes extras from this {@link Conference}. + * + * @param keys The keys of the extras to remove. + */ + public final void removeExtras(String ... keys) { + removeExtras(Arrays.asList(keys)); + } + /** * Returns the extras associated with this conference. *

diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index d83cdb8fa1484..a5e3c4612a5d5 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -35,6 +35,7 @@ import android.util.ArraySet; import android.view.Surface; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Set; @@ -1972,9 +1973,9 @@ public abstract class Connection extends Conferenceable { } /** - * Removes an extra from this {@code Connection}. + * Removes extras from this {@code Connection}. * - * @param keys The key of the extra key to remove. + * @param keys The keys of the extras to remove. */ public final void removeExtras(List keys) { if (mExtras != null) { @@ -1992,6 +1993,15 @@ public abstract class Connection extends Conferenceable { } } + /** + * Removes extras from this {@code Connection}. + * + * @param keys The keys of the extras to remove. + */ + public final void removeExtras(String ... keys) { + removeExtras(Arrays.asList(keys)); + } + /** * Notifies this Connection that the {@link #getAudioState()} property has a new value. *