diff options
| author | Tyler Gunn <tgunn@google.com> | 2016-05-12 00:53:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-12 00:53:20 +0000 |
| commit | 406f7e3bce0f34e5319ef016d940528a4992cddb (patch) | |
| tree | 4db3df609d619bb8528e5be85bb664754bf11541 /InCallUI | |
| parent | a474c857fa71b0eea9a56296368e6a3c0b2f0055 (diff) | |
| parent | aef96789781b9095be4606fd5dfa5f6ff81b6dc6 (diff) | |
Merge "IMS-VT: Call showAnswerUi when onUpgradetoVideo callback is called" into nyc-mr1-dev am: e778d9fece
am: aef9678978
* commit 'aef96789781b9095be4606fd5dfa5f6ff81b6dc6':
IMS-VT: Call showAnswerUi when onUpgradetoVideo callback is called
Change-Id: Iefb62eee7273750b85146f304a49eb1e2581a45f
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 |