From abbeb67a123055af1d140bb8aff259dc210ccfd0 Mon Sep 17 00:00:00 2001
From: Christine Chen <christinech@google.com>
Date: Mon, 7 Oct 2013 16:30:57 -0700
Subject: Adds support for texting after phone disconnects.

Bug: 11111553
Change-Id: I8abcae4439e7b9697d7b4a4335e093d7ad13a1b3
---
 InCallUI/src/com/android/incallui/InCallActivity.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'InCallUI/src/com/android/incallui/InCallActivity.java')

diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index 32d1f5538..ac21d52a2 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -138,6 +138,9 @@ public class InCallActivity extends Activity {
         return mIsForegroundActivity;
     }
 
+    private boolean hasPendingErrorDialog() {
+        return mDialog != null;
+    }
     /**
      * Dismisses the in-call screen.
      *
@@ -158,7 +161,7 @@ public class InCallActivity extends Activity {
         Log.i(this, "finish().  Dialog showing: " + (mDialog != null));
 
         // skip finish if we are still showing a dialog.
-        if (mDialog == null) {
+        if (!hasPendingErrorDialog() && !mAnswerFragment.hasPendingDialogs()) {
             super.finish();
         }
     }
@@ -427,6 +430,7 @@ public class InCallActivity extends Activity {
             mDialog.dismiss();
             mDialog = null;
         }
+        mAnswerFragment.dismissPendingDialogues();
     }
 
     /**
-- 
cgit v1.2.3