commit 406f7e3bce0f34e5319ef016d940528a4992cddb
author Tyler Gunn <tgunn@google.com> Thu May 12 00:53:20 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 12 00:53:20 2016 +0000
tree 4db3df609d619bb8528e5be85bb664754bf11541
parent a474c857fa71b0eea9a56296368e6a3c0b2f0055
parent aef96789781b9095be4606fd5dfa5f6ff81b6dc6

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

InCallUI/src/com/android/incallui/AnswerPresenter.java

diff --git a/InCallUI/src/com/android/incallui/AnswerPresenter.java b/InCallUI/src/com/android/incallui/AnswerPresenter.java
index 6757268..883b54f 100644
--- a/InCallUI/src/com/android/incallui/AnswerPresenter.java
+++ b/InCallUI/src/com/android/incallui/AnswerPresenter.java
@@ -128,10 +128,7 @@
     @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