commit 79ff2bcdbdf1c28f229f4acec9433beb1cd7a57e
author Santos Cordon <santoscordon@google.com> Thu Mar 27 15:31:27 2014 -0700
committer Santos Cordon <santoscordon@google.com> Mon Mar 31 16:06:59 2014 -0700
tree cccd4b40cea46c80040f724fa9626ce47f82372d
parent a56f276cafcad80ab3a28996b6a0d72cffa4b2bc

Add disconnect cause to the disconnect path.

Change-Id: I4488f58eaf656b46410b2ed85999d0598bc11a5d

src/com/android/telecomm/Call.java

diff --git a/src/com/android/telecomm/Call.java b/src/com/android/telecomm/Call.java
index 0789135..88ec312 100644
--- a/src/com/android/telecomm/Call.java
+++ b/src/com/android/telecomm/Call.java
@@ -20,6 +20,7 @@
 import android.telecomm.CallInfo;
 import android.telecomm.CallState;
 import android.telecomm.GatewayInfo;
+import android.telephony.DisconnectCause;
 import android.telephony.PhoneNumberUtils;
 
 import com.google.android.collect.Sets;
@@ -84,6 +85,17 @@
     private boolean mIsEmergencyCall;
 
     /**
+     * Disconnect cause for the call. Only valid if the state of the call is DISCONNECTED.
+     * See {@link android.telephony.DisconnectCause}.
+     */
+    private int mDisconnectCause;
+
+    /**
+     * Additional disconnect information provided by the call service.
+     */
+    private String mDisconnectMessage;
+
+    /**
      * Creates an empty call object with a unique call ID.
      *
      * @param isIncoming True if this is an incoming call.
@@ -108,6 +120,7 @@
         mGatewayInfo = gatewayInfo;
         mIsIncoming = isIncoming;
         mCreationTime = new Date();
+        mDisconnectCause = DisconnectCause.NOT_VALID;
     }
 
     /** {@inheritDoc} */
@@ -132,6 +145,8 @@
      * and instead keep the code resilient to unexpected state changes.
      */
     void setState(CallState newState) {
+        Preconditions.checkState(newState != CallState.DISCONNECTED ||
+                mDisconnectCause != DisconnectCause.NOT_VALID);
         if (mState != newState) {
             Log.v(this, "setState %s -> %s", mState, newState);
             mState = newState;
@@ -148,6 +163,26 @@
                 mHandle.getSchemeSpecificPart(), TelecommApp.getInstance());
     }
 
+    /**
+     * @param disconnectCause The reason for the disconnection, any of
+     *         {@link android.telephony.DisconnectCause}.
+     * @param disconnectMessage Optional call-service-provided message about the disconnect.
+     */
+    void setDisconnectCause(int disconnectCause, String disconnectMessage) {
+        // TODO: Consider combining this method with a setDisconnected() method that is totally
+        // separate from setState.
+        mDisconnectCause = disconnectCause;
+        mDisconnectMessage = disconnectMessage;
+    }
+
+    int getDisconnectCause() {
+        return mDisconnectCause;
+    }
+
+    String getDisconnectMessage() {
+        return mDisconnectMessage;
+    }
+
     boolean isEmergencyCall() {
         return mIsEmergencyCall;
     }