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

Commit 97d4c648 authored by Yorke Lee's avatar Yorke Lee Committed by Android Git Automerger
Browse files

am 4a00d523: Pass in connection to CDMAPhone.notifyUnknownConnection 

* commit '4a00d523':
  Pass in connection to CDMAPhone.notifyUnknownConnection
parents 4cae974a 4a00d523

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

+2 −2
Original line number Diff line number Diff line
@@ -1046,8 +1046,8 @@ public class CDMAPhone extends PhoneBase { 
        mNotifier.notifyDisconnectCause(cn.getDisconnectCause(), cn.getPreciseDisconnectCause());

    }



    void notifyUnknownConnection() {

        mUnknownConnectionRegistrants.notifyResult(this);

    void notifyUnknownConnection(Connection connection) {

        mUnknownConnectionRegistrants.notifyResult(connection);

    }



    @Override

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

+3 −1
Original line number Diff line number Diff line
@@ -505,6 +505,7 @@ public final class CdmaCallTracker extends CallTracker { 
        }



        Connection newRinging = null; //or waiting

        Connection newUnknown = null;

        boolean hasNonHangupStateChanged = false;   // Any change besides

                                                    // a dropped connection

        boolean hasAnyCallDisconnected = false;
@@ -626,6 +627,7 @@ public final class CdmaCallTracker extends CallTracker { 
                        newRinging = checkMtFindNewRinging(dc,i);

                        if (newRinging == null) {

                            unknownConnectionAppeared = true;

                            newUnknown = conn;

                        }

                        checkAndEnableDataCallAfterEmergencyCallDropped();

                    } else {
@@ -731,7 +733,7 @@ public final class CdmaCallTracker extends CallTracker { 
        updatePhoneState();



        if (unknownConnectionAppeared) {

            mPhone.notifyUnknownConnection();

            mPhone.notifyUnknownConnection(newUnknown);

        }



        if (hasNonHangupStateChanged || newRinging != null || hasAnyCallDisconnected) {