commit 6a2bfed2a70c68e8aea054f7eb31d102d0ec898f
author Andrew Lee <anwlee@google.com> Wed Nov 12 15:49:44 2014 -0800
committer Andrew Lee <anwlee@google.com> Wed Nov 12 15:50:18 2014 -0800
tree c04aca4f7c2e899029fb9ee3b9a5b1255a179406
parent 7a0e9b3a6ed1d4ec05d858445da1c05b7ec87c1f

Update DisconnectCause conversion for IMS merges.

For the most part, we don't want to do anything at all if there is a
disconnect because of a successful merge.

Bug: 18291234
Change-Id: Ia528aba24b22397e76d36835ce6aa0afb1ba9d97

src/com/android/services/telephony/DisconnectCauseUtil.java

diff --git a/src/com/android/services/telephony/DisconnectCauseUtil.java b/src/com/android/services/telephony/DisconnectCauseUtil.java
index 8af6849..8f38ee1 100644
--- a/src/com/android/services/telephony/DisconnectCauseUtil.java
+++ b/src/com/android/services/telephony/DisconnectCauseUtil.java
@@ -124,6 +124,7 @@
             case android.telephony.DisconnectCause.DIALED_MMI:
             case android.telephony.DisconnectCause.EXITED_ECM:
             case android.telephony.DisconnectCause.MMI:
+            case android.telephony.DisconnectCause.IMS_MERGED_SUCCESSFULLY:
                 return DisconnectCause.OTHER;
 
             case android.telephony.DisconnectCause.NOT_VALID:
@@ -334,6 +335,8 @@
             case android.telephony.DisconnectCause.NORMAL:
                 return ToneGenerator.TONE_PROP_PROMPT;
 
+            case android.telephony.DisconnectCause.IMS_MERGED_SUCCESSFULLY:
+                // Do not play any tones if disconnected because of a successful merge.
             default:
                 return ToneGenerator.TONE_UNKNOWN;
         }