Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 071be6f4 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Add removeExtras(String...) prototype per API review. 

Per API review, adding a convenience prototype of the removeExtras method.

Bug: 28295516
Change-Id: Icc0e040516c06205540c5683bde16882a73a89d6
parent d740e158

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -36031,6 +36031,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<java.lang.String>);

    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();
@@ -36184,6 +36185,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<java.lang.String>);

    method public final void removeExtras(java.lang.String...);

    method public final void setActive();

    method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);

    method public final void setConnectionCapabilities(int);
@@ -36244,6 +36246,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<java.lang.String>);

    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);

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -38860,6 +38860,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<java.lang.String>);

    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();
@@ -39023,6 +39024,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<java.lang.String>);

    method public final void removeExtras(java.lang.String...);

    method public final void setActive();

    method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);

    method public final deprecated void setConnectTimeMillis(long);
@@ -39086,6 +39088,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<java.lang.String>);

    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);

api/test-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -36108,6 +36108,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<java.lang.String>);

    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();
@@ -36261,6 +36262,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<java.lang.String>);

    method public final void removeExtras(java.lang.String...);

    method public final void setActive();

    method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);

    method public final void setConnectionCapabilities(int);
@@ -36321,6 +36323,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<java.lang.String>);

    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);

telecomm/java/android/telecom/Call.java

+13 −3
Original line number Diff line number Diff line
@@ -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.

     *

telecomm/java/android/telecom/Conference.java

+12 −2
Original line number Diff line number Diff line
@@ -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<String> 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.

     * <p>