diff options
| author | Tyler Gunn <tgunn@google.com> | 2016-05-11 22:29:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-05-11 22:29:45 +0000 |
| commit | e778d9fecead62e01a2696345934d1ee71e0bbe5 (patch) | |
| tree | e6516263f3677e1e359295f0c9f5573a060c6309 /InCallUI | |
| parent | ebef6b94037a2a028635a5371f3d8e0f97c7d206 (diff) | |
| parent | 8d9c4de483823106283ce945a567e76444c72932 (diff) | |
Merge "IMS-VT: Call showAnswerUi when onUpgradetoVideo callback is called" into nyc-mr1-dev
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/AnswerPresenter.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/InCallUI/src/com/android/incallui/AnswerPresenter.java b/InCallUI/src/com/android/incallui/AnswerPresenter.java index 6757268f3..883b54fed 100644 --- a/InCallUI/src/com/android/incallui/AnswerPresenter.java +++ b/InCallUI/src/com/android/incallui/AnswerPresenter.java @@ -128,10 +128,7 @@ public class AnswerPresenter extends Presenter<AnswerPresenter.AnswerUi> @Override public void onUpgradeToVideo(Call call) { Log.d(this, "onUpgradeToVideo: " + this + " call=" + call); - if (getUi() == null) { - Log.d(this, "onUpgradeToVideo ui is null"); - return; - } + showAnswerUi(true); boolean isUpgradePending = isVideoUpgradePending(call); InCallPresenter inCallPresenter = InCallPresenter.getInstance(); if (isUpgradePending |