commit cb619fba8f6571c60634403de3042b943a9d760b
author Tyler Gunn <tgunn@google.com> Thu Jul 28 11:26:25 2016 -0700
committer gitbuildkicker <android-build@google.com> Fri Jul 29 13:42:33 2016 -0700
tree 73cbcbe7c9dc5f0c9f5424891852f75da1647f72
parent 2e3a4ed5e742aeee8dd6295bb44264c31e6a6b69

Fix issue where incoming rejected calls were not being marked as such.

Code in onDisconnect for ImsPhoneConnection assumed that if the current
disconnect cause is "LOCAL" that we couldn't ever override this value.
However, in the case of an incoming rejected call, we do want to override
the disconnect cause.

Bug: 30474601
Change-Id: I3ffe4e6844658e063c01ea5e3aeec82989d053cd

src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java

diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java
index b2fecd4..7462daa 100644
--- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java
+++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java
@@ -391,7 +391,9 @@
     @Override
     public boolean onDisconnect(int cause) {
         Rlog.d(LOG_TAG, "onDisconnect: cause=" + cause);
-        if (mCause != DisconnectCause.LOCAL) mCause = cause;
+        if (mCause != DisconnectCause.LOCAL || cause == DisconnectCause.INCOMING_REJECTED) {
+            mCause = cause;
+        }
         return onDisconnect();
     }