commit 5142ac120c0d41c430779edfb46edcb4cff5d5c9
author Linux Build Service Account <lnxbuild@localhost> Tue Apr 18 03:22:55 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Apr 18 03:22:55 2017 -0700
tree 8f0e56ac5b83ddbd0da1ab8611ec645b103602f4
parent db1215879c277d0898acd3c6feb2b303e8d3094d
parent d937116dd9d78c881e5a42bf4712e2e65ee00191

Merge "IMS-VT: Device does not wake up during VT upgrade scenario." into atel.lnx.2.0-dev

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

diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index fa8ddb5..b2b2d8d 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -1918,7 +1918,7 @@
         return mPowerManager.isInteractive();
     }
 
-    private void wakeUpScreen() {
+    public void wakeUpScreen() {
         if (!isScreenInteractive()) {
             acquireWakeLock();
             releaseWakeLock();

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

diff --git a/InCallUI/src/com/android/incallui/VideoCallPresenter.java b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
index f886836..0b61102 100644
--- a/InCallUI/src/com/android/incallui/VideoCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
@@ -625,6 +625,11 @@
             mVideoCall.setPauseImage(null);
         }
 
+        // Wakes up the screen,if its off, when user upgrades to VT call.
+        if (mCurrentVideoState == VideoProfile.STATE_AUDIO_ONLY && isVideoCall) {
+            InCallPresenter.getInstance().wakeUpScreen();
+        }
+
         updateCameraSelection(call);
 
         if (isVideoCall) {