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

Commit 529fcf97 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 9684 

* changes:
  Add a DISCONNECTING call state.
parents f59af9a3 e7a9201e

telephony/java/com/android/internal/telephony/Call.java

+2 −2
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ public abstract class Call { 
    /* Enums */



    public enum State {

        IDLE, ACTIVE, HOLDING, DIALING, ALERTING, INCOMING, WAITING, DISCONNECTED;

        IDLE, ACTIVE, HOLDING, DIALING, ALERTING, INCOMING, WAITING, DISCONNECTED, DISCONNECTING;



        public boolean isAlive() {

            return !(this == IDLE || this == DISCONNECTED);

            return !(this == IDLE || this == DISCONNECTED || this == DISCONNECTING);

        }



        public boolean isRinging() {

telephony/java/com/android/internal/telephony/cdma/CdmaCall.java

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import com.android.internal.telephony.CallStateException; 
import com.android.internal.telephony.Connection;

import com.android.internal.telephony.DriverCall;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.Call.State;



/**

 * {@hide}
@@ -186,6 +187,7 @@ public final class CdmaCall extends Call { 


            cn.onHangupLocal();

        }

        state = State.DISCONNECTING;

    }



    /**

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

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



        call.onHangupLocal();

        phone.notifyPreciseCallStateChanged();

    }



    /* package */

telephony/java/com/android/internal/telephony/gsm/GsmCall.java

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ class GsmCall extends Call { 


            cn.onHangupLocal();

        }

        state = State.DISCONNECTING;

    }



    /**

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

+1 −0
Original line number Diff line number Diff line
@@ -738,6 +738,7 @@ public final class GsmCallTracker extends CallTracker { 
        }



        call.onHangupLocal();

        phone.notifyPreciseCallStateChanged();

    }



    /* package */