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

Commit 6b7f955c authored by Santos Cordon's avatar Santos Cordon
Browse files

Add extras to Connections/Calls. (1/3) 

Two major changes:
1) Add the notion of extras to a Connection.  These extras will be
parceled through to InCallService as Call.getExtras()
2) The previously existing Call.getExtras() has been renamed to
getIntentExtras(). This name better describes the fact that these
particular extras are from the original CALL or INCOMING_CALL intents.

Change-Id: I08c1baf4f08d54757f98012f0c08b423a707c53d
parent 6ffab1bd

api/current.txt

+9 −0
Original line number Diff line number Diff line
@@ -30000,6 +30000,7 @@ package android.telecom { 
    method public android.telecom.GatewayInfo getGatewayInfo();

    method public android.net.Uri getHandle();

    method public int getHandlePresentation();

    method public android.os.Bundle getIntentExtras();

    method public android.telecom.StatusHints getStatusHints();

    method public int getVideoState();

    method public static boolean hasProperty(int, int);
@@ -30054,6 +30055,7 @@ package android.telecom { 
    method public final long getConnectionTime();

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

    method public final android.telecom.DisconnectCause getDisconnectCause();

    method public final android.os.Bundle getExtras();

    method public final android.telecom.PhoneAccountHandle getPhoneAccountHandle();

    method public final int getState();

    method public final android.telecom.StatusHints getStatusHints();
@@ -30076,6 +30078,7 @@ package android.telecom { 
    method public final void setConnectionCapabilities(int);

    method public final void setConnectionTime(long);

    method public final void setDisconnected(android.telecom.DisconnectCause);

    method public final void setExtras(android.os.Bundle);

    method public final void setOnHold();

    method public final void setStatusHints(android.telecom.StatusHints);

    method public final void setVideoProvider(android.telecom.Connection, android.telecom.Connection.VideoProvider);
@@ -30102,6 +30105,7 @@ package android.telecom { 
    method public final java.util.List<android.telecom.Conferenceable> getConferenceables();

    method public final int getConnectionCapabilities();

    method public final android.telecom.DisconnectCause getDisconnectCause();

    method public final android.os.Bundle getExtras();

    method public final int getState();

    method public final android.telecom.StatusHints getStatusHints();

    method public final android.telecom.Connection.VideoProvider getVideoProvider();
@@ -30129,6 +30133,7 @@ package android.telecom { 
    method public final void setConnectionService(android.telecom.ConnectionService);

    method public final void setDialing();

    method public final void setDisconnected(android.telecom.DisconnectCause);

    method public final void setExtras(android.os.Bundle);

    method public final void setInitialized();

    method public final void setInitializing();

    method public final void setNextPostDialChar(char);
@@ -30369,6 +30374,7 @@ package android.telecom { 
    method public final int getConnectionCapabilities();

    method public final java.util.List<android.telecom.RemoteConnection> getConnections();

    method public android.telecom.DisconnectCause getDisconnectCause();

    method public final android.os.Bundle getExtras();

    method public final int getState();

    method public void hold();

    method public void merge();
@@ -30391,6 +30397,7 @@ package android.telecom { 
    method public void onConnectionRemoved(android.telecom.RemoteConference, android.telecom.RemoteConnection);

    method public void onDestroyed(android.telecom.RemoteConference);

    method public void onDisconnected(android.telecom.RemoteConference, android.telecom.DisconnectCause);

    method public void onExtrasChanged(android.telecom.RemoteConference, android.os.Bundle);

    method public void onStateChanged(android.telecom.RemoteConference, int, int);

  }









@@ -30406,6 +30413,7 @@ package android.telecom {













    method public java.util.List<android.telecom.RemoteConnection> getConferenceableConnections();















    method public int getConnectionCapabilities();















    method public android.telecom.DisconnectCause getDisconnectCause();













    method public final android.os.Bundle getExtras();















    method public int getState();















    method public android.telecom.StatusHints getStatusHints();















    method public void hold();









@@ -30431,6 +30439,7 @@ package android.telecom {













    method public void onConnectionCapabilitiesChanged(android.telecom.RemoteConnection, int);















    method public void onDestroyed(android.telecom.RemoteConnection);















    method public void onDisconnected(android.telecom.RemoteConnection, android.telecom.DisconnectCause);













    method public void onExtrasChanged(android.telecom.RemoteConnection, android.os.Bundle);















    method public void onPostDialChar(android.telecom.RemoteConnection, char);















    method public void onPostDialWait(android.telecom.RemoteConnection, java.lang.String);















    method public void onRingbackRequested(android.telecom.RemoteConnection, boolean);

























api/system-current.txt



+9
−0




























Original line number
Diff line number
Diff line








@@ -32147,6 +32147,7 @@ package android.telecom {













    method public android.telecom.GatewayInfo getGatewayInfo();















    method public android.net.Uri getHandle();















    method public int getHandlePresentation();













    method public android.os.Bundle getIntentExtras();















    method public android.telecom.StatusHints getStatusHints();















    method public int getVideoState();















    method public static boolean hasProperty(int, int);










@@ -32207,6 +32208,7 @@ package android.telecom {













    method public final long getConnectionTime();















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















    method public final android.telecom.DisconnectCause getDisconnectCause();













    method public final android.os.Bundle getExtras();















    method public final android.telecom.PhoneAccountHandle getPhoneAccountHandle();















    method public android.telecom.Connection getPrimaryConnection();















    method public final int getState();









@@ -32232,6 +32234,7 @@ package android.telecom {













    method public final void setConnectionCapabilities(int);















    method public final void setConnectionTime(long);















    method public final void setDisconnected(android.telecom.DisconnectCause);













    method public final void setExtras(android.os.Bundle);















    method public final void setOnHold();















    method public final void setStatusHints(android.telecom.StatusHints);















    method public final void setVideoProvider(android.telecom.Connection, android.telecom.Connection.VideoProvider);










@@ -32259,6 +32262,7 @@ package android.telecom {













    method public final java.util.List<android.telecom.Conferenceable> getConferenceables();















    method public final int getConnectionCapabilities();















    method public final android.telecom.DisconnectCause getDisconnectCause();













    method public final android.os.Bundle getExtras();















    method public final int getState();















    method public final android.telecom.StatusHints getStatusHints();















    method public final android.telecom.Connection.VideoProvider getVideoProvider();










@@ -32287,6 +32291,7 @@ package android.telecom {













    method public final void setConnectionService(android.telecom.ConnectionService);















    method public final void setDialing();















    method public final void setDisconnected(android.telecom.DisconnectCause);













    method public final void setExtras(android.os.Bundle);















    method public final void setInitialized();















    method public final void setInitializing();















    method public final void setNextPostDialChar(char);










@@ -32552,6 +32557,7 @@ package android.telecom {













    method public final int getConnectionCapabilities();















    method public final java.util.List<android.telecom.RemoteConnection> getConnections();















    method public android.telecom.DisconnectCause getDisconnectCause();













    method public final android.os.Bundle getExtras();















    method public final int getState();















    method public void hold();















    method public void merge();









@@ -32575,6 +32581,7 @@ package android.telecom {













    method public void onConnectionRemoved(android.telecom.RemoteConference, android.telecom.RemoteConnection);















    method public void onDestroyed(android.telecom.RemoteConference);















    method public void onDisconnected(android.telecom.RemoteConference, android.telecom.DisconnectCause);













    method public void onExtrasChanged(android.telecom.RemoteConference, android.os.Bundle);















    method public void onStateChanged(android.telecom.RemoteConference, int, int);















  }























@@ -32590,6 +32597,7 @@ package android.telecom {













    method public java.util.List<android.telecom.RemoteConnection> getConferenceableConnections();















    method public int getConnectionCapabilities();















    method public android.telecom.DisconnectCause getDisconnectCause();













    method public final android.os.Bundle getExtras();















    method public int getState();















    method public android.telecom.StatusHints getStatusHints();















    method public void hold();









@@ -32616,6 +32624,7 @@ package android.telecom {













    method public void onConnectionCapabilitiesChanged(android.telecom.RemoteConnection, int);















    method public void onDestroyed(android.telecom.RemoteConnection);















    method public void onDisconnected(android.telecom.RemoteConnection, android.telecom.DisconnectCause);













    method public void onExtrasChanged(android.telecom.RemoteConnection, android.os.Bundle);















    method public void onPostDialChar(android.telecom.RemoteConnection, char);















    method public void onPostDialWait(android.telecom.RemoteConnection, java.lang.String);















    method public void onRingbackRequested(android.telecom.RemoteConnection, boolean);

























telecomm/java/android/telecom/Call.java



+18
−5




























Original line number
Diff line number
Diff line








@@ -253,6 +253,7 @@ public final class Call {













        private final int mVideoState;















        private final StatusHints mStatusHints;















        private final Bundle mExtras;













        private final Bundle mIntentExtras;































        /**















         * Whether the supplied capabilities  supports the specified capability.










@@ -480,12 +481,19 @@ public final class Call {













        }































        /**













         * @return A bundle extras to pass with the call













         * @return The extras associated with this call.















         */















        public Bundle getExtras() {















            return mExtras;















        }





























        /**













         * @return The extras used with the original intent to place this call.













         */













        public Bundle getIntentExtras() {













            return mIntentExtras;













        }





























        @Override















        public boolean equals(Object o) {















            if (o instanceof Details) {









@@ -504,7 +512,8 @@ public final class Call {













                        Objects.equals(mGatewayInfo, d.mGatewayInfo) &&















                        Objects.equals(mVideoState, d.mVideoState) &&















                        Objects.equals(mStatusHints, d.mStatusHints) &&













                        Objects.equals(mExtras, d.mExtras);













                        Objects.equals(mExtras, d.mExtras) &&













                        Objects.equals(mIntentExtras, d.mIntentExtras);















            }















            return false;















        }









@@ -524,7 +533,8 @@ public final class Call {













                    Objects.hashCode(mGatewayInfo) +















                    Objects.hashCode(mVideoState) +















                    Objects.hashCode(mStatusHints) +













                    Objects.hashCode(mExtras);













                    Objects.hashCode(mExtras) +













                    Objects.hashCode(mIntentExtras);















        }































        /** {@hide} */









@@ -541,7 +551,8 @@ public final class Call {













                GatewayInfo gatewayInfo,















                int videoState,















                StatusHints statusHints,













                Bundle extras) {













                Bundle extras,













                Bundle intentExtras) {















            mHandle = handle;















            mHandlePresentation = handlePresentation;















            mCallerDisplayName = callerDisplayName;









@@ -555,6 +566,7 @@ public final class Call {













            mVideoState = videoState;















            mStatusHints = statusHints;















            mExtras = extras;













            mIntentExtras = intentExtras;















        }















    }


























@@ -986,7 +998,8 @@ public final class Call {













                parcelableCall.getGatewayInfo(),















                parcelableCall.getVideoState(),















                parcelableCall.getStatusHints(),













                parcelableCall.getExtras());













                parcelableCall.getExtras(),













                parcelableCall.getIntentExtras());















        boolean detailsChanged = !Objects.equals(mDetails, details);















        if (detailsChanged) {















            mDetails = details;

































telecomm/java/android/telecom/Conference.java



+25
−0




























Original line number
Diff line number
Diff line








@@ -16,7 +16,9 @@





























package android.telecom;





























import android.annotation.Nullable;















import android.annotation.SystemApi;













import android.os.Bundle;















import android.telecom.Connection.VideoProvider;































import java.util.ArrayList;










@@ -52,6 +54,7 @@ public abstract class Conference extends Conferenceable {













        public void onVideoStateChanged(Conference c, int videoState) { }















        public void onVideoProviderChanged(Conference c, Connection.VideoProvider videoProvider) {}















        public void onStatusHintsChanged(Conference conference, StatusHints statusHints) {}













        public void onExtrasChanged(Conference conference, Bundle extras) {}















    }































    private final Set<Listener> mListeners = new CopyOnWriteArraySet<>();









@@ -70,6 +73,7 @@ public abstract class Conference extends Conferenceable {













    private String mDisconnectMessage;















    private long mConnectTimeMillis = CONNECT_TIME_NOT_SPECIFIED;















    private StatusHints mStatusHints;













    private Bundle mExtras;































    private final Connection.Listener mConnectionDeathListener = new Connection.Listener() {















        @Override










@@ -600,4 +604,25 @@ public abstract class Conference extends Conferenceable {













    public final StatusHints getStatusHints() {















        return mStatusHints;















    }



























    /**













     * Set some extras that can be associated with this {@code Conference}. No assumptions should













     * be made as to how an In-Call UI or service will handle these extras.













     * Keys should be fully qualified (e.g., com.example.MY_EXTRA) to avoid conflicts.













     *













     * @param extras The extras associated with this {@code Connection}.













     */













    public final void setExtras(@Nullable Bundle extras) {













        mExtras = extras;













        for (Listener l : mListeners) {













            l.onExtrasChanged(this, extras);













        }













    }



























    /**













     * @return The extras associated with this conference.













     */













    public final Bundle getExtras() {













        return mExtras;













    }















}
























telecomm/java/android/telecom/Connection.java



+26
−0




























Original line number
Diff line number
Diff line








@@ -20,8 +20,10 @@ import com.android.internal.os.SomeArgs;













import com.android.internal.telecom.IVideoCallback;















import com.android.internal.telecom.IVideoProvider;





























import android.annotation.Nullable;















import android.annotation.SystemApi;















import android.net.Uri;













import android.os.Bundle;















import android.os.Handler;















import android.os.IBinder;















import android.os.Message;










@@ -334,6 +336,7 @@ public abstract class Connection extends Conferenceable {













                List<ConferenceParticipant> participants) {}















        public void onConferenceStarted() {}















        public void onConferenceMergeFailed(Connection c) {}













        public void onExtrasChanged(Connection c, Bundle extras) {}















    }































    public static abstract class VideoProvider {










@@ -832,6 +835,7 @@ public abstract class Connection extends Conferenceable {













    private DisconnectCause mDisconnectCause;















    private Conference mConference;















    private ConnectionService mConnectionService;













    private Bundle mExtras;































    /**















     * Create a new Connection.










@@ -941,6 +945,13 @@ public abstract class Connection extends Conferenceable {













        return mStatusHints;















    }





























    /**













     * @return The extras associated with this connection.













     */













    public final Bundle getExtras() {













        return mExtras;













    }





























    /**















     * Assign a listener to be notified of state changes.















     *










@@ -1370,6 +1381,21 @@ public abstract class Connection extends Conferenceable {













        }















    }





























    /**













     * Set some extras that can be associated with this {@code Connection}. No assumptions should













     * be made as to how an In-Call UI or service will handle these extras.













     * Keys should be fully qualified (e.g., com.example.MY_EXTRA) to avoid conflicts.













     *













     * @param extras The extras associated with this {@code Connection}.













     */













    public final void setExtras(@Nullable Bundle extras) {













        checkImmutable();













        mExtras = extras;













        for (Listener l : mListeners) {













            l.onExtrasChanged(this, extras);













        }













    }





























    /**















     * Notifies this Connection that the {@link #getAudioState()} property has a new value.















     *