commit 145e0a46da638f0e4a9bd459e0002b14f5043656
author Pengquan Meng <mpq@google.com> Fri Oct 27 00:15:12 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 27 00:15:12 2017 +0000
tree 742f3ecf86b91604fa2f83e739dd330bede39f22
parent bb69d593b8d6f8eb4411331f387a92b3233fd511
parent b092b90d8b70d77a6712dfeb5e427655de389d80

Merge "Show error dialog only when 'ask first' is not set"
am: b092b90d8b

Change-Id: I18baabafcbfb59de4ff09e8d072cba5181bddeab

src/com/android/server/telecom/CallsManager.java

diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index b473ccc..9fe9bce 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -3064,7 +3064,7 @@
     */
     private void maybeShowErrorDialogOnDisconnect(Call call) {
         if (call.getState() == CallState.DISCONNECTED && (isPotentialMMICode(call.getHandle())
-                || isPotentialInCallMMICode(call.getHandle()))) {
+                || isPotentialInCallMMICode(call.getHandle())) && !mCalls.contains(call)) {
             DisconnectCause disconnectCause = call.getDisconnectCause();
             if (!TextUtils.isEmpty(disconnectCause.getDescription()) && (disconnectCause.getCode()
                     == DisconnectCause.ERROR)) {