commit 0b35f04f2e58095d7292468c746d992913965eea
author Anders Kristensen <andersk@google.com> Thu Feb 27 14:31:07 2014 -0800
committer Anders Kristensen <andersk@google.com> Wed Mar 05 16:29:38 2014 -0800
tree 8fbe6dd03ce45c279e270a74149e10a41bd629fd
parent f2a2105ec6c11d89a0df6e78aad0fc465a34d1ae

Remove duplicate call disconnect codes.

The Android code base defines call disconnect codes in three places:
 - android.telephony.DisconnectCause
 - android.internal.telephony.Connection.DisconnectCause
 - com.android.services.telephony.common.Call.DisconnectCause

This CL consolidates the code to use the integer codes from
android.telephony.DisconnectCause everywhere.

Change-Id: I84a3fd5182a51d07fc7d81076e4b2c15ff26c61c

src/com/android/phone/EmergencyCallHelper.java

diff --git a/src/com/android/phone/EmergencyCallHelper.java b/src/com/android/phone/EmergencyCallHelper.java
index 47f0e54..74ce088 100644
--- a/src/com/android/phone/EmergencyCallHelper.java
+++ b/src/com/android/phone/EmergencyCallHelper.java
@@ -29,6 +29,7 @@
 import android.os.PowerManager;
 import android.os.UserHandle;
 import android.provider.Settings;
+import android.telephony.DisconnectCause;
 import android.telephony.ServiceState;
 import android.util.Log;
 
@@ -234,11 +235,12 @@
      */
     private void onDisconnect(Message msg) {
         Connection conn = (Connection) ((AsyncResult) msg.obj).result;
-        Connection.DisconnectCause cause = conn.getDisconnectCause();
+        int cause = conn.getDisconnectCause();
         if (DBG) log("onDisconnect: connection '" + conn
-                     + "', addr '" + conn.getAddress() + "', cause = " + cause);
+                     + "', addr '" + conn.getAddress()
+                     + "', cause = " + DisconnectCause.toString(cause));
 
-        if (cause == Connection.DisconnectCause.OUT_OF_SERVICE) {
+        if (cause == DisconnectCause.OUT_OF_SERVICE) {
             // Wait a bit more and try again (or just bail out totally if
             // we've had too many failures.)
             if (DBG) log("- onDisconnect: OUT_OF_SERVICE, need to retry...");