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

Commit d8799de4 authored by Nancy Chen's avatar Nancy Chen Committed by Android Git Automerger
Browse files

am efb8df7d: Merge "Notify listeners of a Connection if a DTMF character has... 

am efb8df7d: Merge "Notify listeners of a Connection if a DTMF character has been processed." into lmp-mr1-dev

* commit 'efb8df7d':
  Notify listeners of a Connection if a DTMF character has been processed.
parents 44738f21 efb8df7d

src/java/com/android/internal/telephony/Connection.java

+7 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import java.util.concurrent.CopyOnWriteArraySet; 
public abstract class Connection {

    public interface PostDialListener {

        void onPostDialWait();

        void onPostDialChar(char c);

    }



    /**
@@ -352,6 +353,12 @@ public abstract class Connection { 
        }

    }



    protected final void notifyPostDialListenersNextChar(char c) {

        for (PostDialListener listener : new ArrayList<>(mPostDialListeners)) {

            listener.onPostDialChar(c);

        }

    }



    public abstract PostDialState getPostDialState();



    /**

src/java/com/android/internal/telephony/cdma/CdmaConnection.java

+3 −0
Original line number Diff line number Diff line
@@ -689,6 +689,9 @@ public class CdmaConnection extends Connection { 
            }

        }



        notifyPostDialListenersNextChar(c);



        // TODO: remove the following code since the handler no longer executes anything.

        postDialHandler = mOwner.mPhone.mPostDialHandler;



        Message notifyMessage;

src/java/com/android/internal/telephony/gsm/GsmConnection.java

+3 −0
Original line number Diff line number Diff line
@@ -637,6 +637,9 @@ public class GsmConnection extends Connection { 
            }

        }



        notifyPostDialListenersNextChar(c);



        // TODO: remove the following code since the handler no longer executes anything.

        postDialHandler = mOwner.mPhone.mPostDialHandler;



        Message notifyMessage;

src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java

+3 −0
Original line number Diff line number Diff line
@@ -446,6 +446,9 @@ public class ImsPhoneConnection extends Connection { 
            }

        }



        notifyPostDialListenersNextChar(c);



        // TODO: remove the following code since the handler no longer executes anything.

        postDialHandler = mOwner.mPhone.mPostDialHandler;



        Message notifyMessage;