diff options
author | Li Wei <liwei@codeaurora.org> | 2017-02-07 18:15:13 +0800 |
---|---|---|
committer | Arne Coucheron <arco68@gmail.com> | 2017-05-19 17:33:36 +0000 |
commit | 77b414754e0b91409030c2d9fcf7a4310fdb8f72 (patch) | |
tree | 3303c63e27cb18a5588688e581cee69ec0c77b62 | |
parent | 11b92979bc4050628846a6a81878b507e5e6c1f9 (diff) | |
download | android_packages_apps_Dialer-77b414754e0b91409030c2d9fcf7a4310fdb8f72.tar.gz android_packages_apps_Dialer-77b414754e0b91409030c2d9fcf7a4310fdb8f72.tar.bz2 android_packages_apps_Dialer-77b414754e0b91409030c2d9fcf7a4310fdb8f72.zip |
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
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallPresenter.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java index d8a3f7c96..fb96a1aa1 100644 --- a/InCallUI/src/com/android/incallui/InCallPresenter.java +++ b/InCallUI/src/com/android/incallui/InCallPresenter.java @@ -731,7 +731,9 @@ public class InCallPresenter implements CallList.Listener, if (CallList.getInstance().isDsdaEnabled() && (mInCallActivity != null)) { mInCallActivity.updateDsdaTab(); } - wakeUpScreen(); + if (isActivityStarted()) { + wakeUpScreen(); + } } @Override |