commit d9fc36b54f171186670a6bf58158eaf91b9a5e90
author Li Wei <liwei@codeaurora.org> Tue Feb 07 18:15:13 2017 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Feb 08 22:22:47 2017 -0800
tree 0397d74450a168003d5b306d9adbe7527cb13184
parent 18511ed2563a785929d46e40ff97d6448d37a072

Dialer: lock screen appear before incoming call screen

-Screen wakes up earlier than InCallActivity is created by Incoming
 Call

-Show InCallUI after InCallActivity has been created and is running
 as long as activity is not destroyed or finishing

CRs-Fixed: 1113931
Change-Id: I64678f8f4d0c10b9fadd61357ed2140eb9bbdf7e

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 1e0a8f7..83a16d9 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -728,7 +728,9 @@
         if (CallList.getInstance().isDsdaEnabled() && (mInCallActivity != null)) {
             mInCallActivity.updateDsdaTab();
         }
-        wakeUpScreen();
+        if (isActivityStarted()) {
+            wakeUpScreen();
+        }
     }
 
     @Override