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

Commit 0112a0d7 authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Implement DTMF device to device protocol." am: 1dbf9312 am: b9685122 am: 59be51f1 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1566741

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7b835b5f54f26970c6abd97a045ed1eff044756
parents 2a8d426f 59be51f1

src/java/com/android/internal/telephony/d2d/Communicator.java

+17 −2
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ public class Communicator implements TransportProtocol.Callback { 
    }



    private boolean mIsNegotiated;

    private boolean mIsNegotiationAttempted;

    private TransportProtocol mActiveTransport;

    private List<TransportProtocol> mTransportProtocols = new ArrayList<>();

    private Callback mCallback;
@@ -126,8 +127,10 @@ public class Communicator implements TransportProtocol.Callback { 
    public void onStateChanged(Connection c, @Connection.ConnectionState int state) {

        if (state == Connection.STATE_ACTIVE) {

            // Protocol negotiation can start as we are active

            if (mActiveTransport == null) {

            if (mActiveTransport == null && !mIsNegotiationAttempted) {

                mIsNegotiated = false;

                mIsNegotiationAttempted = true;

                Log.i(this, "onStateChanged: call active; negotiate D2D.");

                negotiateNextProtocol();

            }

        }
@@ -141,7 +144,13 @@ public class Communicator implements TransportProtocol.Callback { 
    public void onNegotiationSuccess(@NonNull TransportProtocol protocol) {

        if (protocol != mActiveTransport) {

            // Uh oh, shouldn't happen.

            String activeTransportName = mActiveTransport == null ? "none"

                    : mActiveTransport.getClass().getSimpleName();

            Log.w(this, "onNegotiationSuccess: ignored - %s negotiated but active transport is %s.",

                    protocol.getClass().getSimpleName(), activeTransportName);

        }

        Log.i(this, "onNegotiationSuccess: %s negotiated; setting active.",

                protocol.getClass().getSimpleName());

        mIsNegotiated = true;

    }
@@ -154,6 +163,8 @@ public class Communicator implements TransportProtocol.Callback { 
        if (protocol != mActiveTransport) {

            // Uh oh, shouldn't happen.

        }

        Log.i(this, "onNegotiationFailed: %s failed to negotiate.",

                protocol.getClass().getSimpleName());

        mIsNegotiated = false;

        negotiateNextProtocol();

    }
@@ -180,6 +191,8 @@ public class Communicator implements TransportProtocol.Callback { 
            return;

        }



        Log.i(this, "sendMessages: msgs=%d, activeTransport=%s",

                messages.size(), mActiveTransport.getClass().getSimpleName());

        mActiveTransport.sendMessages(messages);

    }
@@ -190,9 +203,11 @@ public class Communicator implements TransportProtocol.Callback { 
        mActiveTransport = getNextCandidateProtocol();

        if (mActiveTransport == null) {

            // No more protocols, exit.

            Log.i(this, "negotiateNextProtocol: no remaining transports.");

            return;

        }



        Log.i(this, "negotiateNextProtocol: trying %s",

                mActiveTransport.getClass().getSimpleName());

        mActiveTransport.startNegotiation();

    }

src/java/com/android/internal/telephony/d2d/DtmfAdapter.java

+0 −10
Original line number Diff line number Diff line
@@ -22,16 +22,6 @@ import android.os.Message; 
 * Abstracts interaction with DTMF communication APIs.

 */

public interface DtmfAdapter {

    /**

     * Called when a DTMF digit is received from the network.

     * <p>

     * In concrete implementations, should be linked to

     * {@link android.telephony.ims.ImsCallSessionListener#callSessionDtmfReceived(char)}.

     *

     * @param digit The received DTMF digit.

     */

    void onDtmfReceived(char digit);



    /**

     * Called when a DTMF digit should be sent to the network.

     * <p>