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

Commit 4a00d523 authored by Yorke Lee's avatar Yorke Lee
Browse files

Pass in connection to CDMAPhone.notifyUnknownConnection 

An equivalent change has already been made in GSMPhone.

Bug: 17939852
Change-Id: I546618b3d56b2c855e33d8a5604478262f21514c
parent c93ffd4a

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