commit 5287e809a796b5b13523e1cc26115700200dc142
author Linux Build Service Account <lnxbuild@localhost> Tue Apr 18 11:42:17 2017 -0600
committer Linux Build Service Account <lnxbuild@localhost> Tue Apr 18 11:42:17 2017 -0600
tree 8f0e56ac5b83ddbd0da1ab8611ec645b103602f4
parent 184bf9511ff1cf60b1e9b38ab324f6ab1df2705f
parent 5142ac120c0d41c430779edfb46edcb4cff5d5c9

Promotion of atel.lnx.2.0-00073.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
2023086   I28ad2c4be5fc2f504a4c73834d8c7ec8333ee86b   IMS-VT: Device does not wake up during VT upgrade scenar

Change-Id: Ic024e334dba359ebb43509cc7fb677799282f736
CRs-Fixed: 2023086

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) {