diff options
| author | Garik Badalyan <garikb@codeaurora.org> | 2016-05-11 22:39:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-11 22:39:16 +0000 |
| commit | aef96789781b9095be4606fd5dfa5f6ff81b6dc6 (patch) | |
| tree | c0ee21891f4b30d2fa624c488c7052f41ddfac98 /InCallUI | |
| parent | 6f10f26b628d0ae477d599e3ee153a4a336254fe (diff) | |
| parent | e778d9fecead62e01a2696345934d1ee71e0bbe5 (diff) | |
Merge "IMS-VT: Call showAnswerUi when onUpgradetoVideo callback is called" into nyc-mr1-dev
am: e778d9fece
* commit 'e778d9fecead62e01a2696345934d1ee71e0bbe5':
IMS-VT: Call showAnswerUi when onUpgradetoVideo callback is called
Change-Id: Ib253818ee10d931d00ba637eca8f7dd38a8ba932
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 |