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

Commit cd17a8e5 authored by Wink Saville's avatar Wink Saville Committed by Gerrit Code Review
Browse files

Merge "Telephony: Update call timer for phantom call"

parents bf358b36 9b41acc4

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

+5 −1
Original line number Diff line number Diff line
@@ -1112,7 +1112,11 @@ public final class CdmaCallTracker extends CallTracker { 
            // it won't appear as a Missed Call.

            if (dc.state != DriverCall.State.ALERTING

                && dc.state != DriverCall.State.DIALING) {

                connections[i].connectTime = System.currentTimeMillis();

                connections[i].onConnectedInOrOut();

                if (dc.state == DriverCall.State.HOLDING) {

                    // We've transitioned into HOLDING

                    connections[i].onStartedHolding();

                }

            }

        }

        return newRinging;

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

+1 −1
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ public class CdmaConnection extends Connection { 
       disconnected = true;

    }



    private void

    /*package*/ void

    onStartedHolding() {

        holdingStartTime = SystemClock.elapsedRealtime();

    }

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

+5 −1
Original line number Diff line number Diff line
@@ -497,7 +497,11 @@ public final class GsmCallTracker extends CallTracker { 
                        // it won't appear as a Missed Call.

                        if (dc.state != DriverCall.State.ALERTING

                                && dc.state != DriverCall.State.DIALING) {

                            connections[i].connectTime = System.currentTimeMillis();

                            connections[i].onConnectedInOrOut();

                            if (dc.state == DriverCall.State.HOLDING) {

                                // We've transitioned into HOLDING

                                connections[i].onStartedHolding();

                            }

                        }



                        unknownConnectionAppeared = true;

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

+1 −1
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ public class GsmConnection extends Connection { 
        releaseWakeLock();

    }



    private void

    /*package*/ void

    onStartedHolding() {

        holdingStartTime = SystemClock.elapsedRealtime();

    }