diff options
author | Christine Chen <christinech@google.com> | 2013-10-07 16:30:57 -0700 |
---|---|---|
committer | Christine Chen <christinech@google.com> | 2013-10-07 17:14:09 -0700 |
commit | abbeb67a123055af1d140bb8aff259dc210ccfd0 (patch) | |
tree | 56fe7c93bbf64bc75405dd5f375513619ab65a9a /InCallUI/src/com/android/incallui/InCallActivity.java | |
parent | 5a405a7d5ebce3601d15dc1dea80330e357e0866 (diff) |
Adds support for texting after phone disconnects.
Bug: 11111553
Change-Id: I8abcae4439e7b9697d7b4a4335e093d7ad13a1b3
Diffstat (limited to 'InCallUI/src/com/android/incallui/InCallActivity.java')
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 6 |
1 files changed, 5 insertions, 1 deletions
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(); } /** |