2 files changed, 11 insertions, 4 deletions
diff --git a/src/com/android/incallui/InCallPresenter.java b/src/com/android/incallui/InCallPresenter.java
index b697e393..e328169c 100644
--- a/src/com/android/incallui/InCallPresenter.java
+++ b/src/com/android/incallui/InCallPresenter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
  * Not a Contribution, Apache license notifications and license are retained
  * for attribution purposes only.
  *
@@ -368,7 +368,12 @@ public class InCallPresenter implements CallList.Listener {
             if (newState != InCallState.DISCONNECTING) {
                 mInCallActivity.updateSystemBarTranslucency();
             }
+        }
 
+        // Get the config whether we need to dismiss the keyguard screen, Google design is true.
+        boolean shouldDismissKeyguard = (mInCallActivity != null &&
+                mInCallActivity.getResources().getBoolean(R.bool.config_incall_dismiss_keyguard));
+        if (isActivityStarted() && shouldDismissKeyguard) {
             final boolean hasCall = callList.getActiveOrBackgroundCall() != null ||
                     callList.getOutgoingCall() != null;
             mInCallActivity.dismissKeyguard(hasCall);
@@ -418,7 +423,10 @@ public class InCallPresenter implements CallList.Listener {
         // We need to do the run the same code as onCallListChange.
         onCallListChange(CallList.getInstance());
 
-        if (isActivityStarted()) {
+        // Get the config whether we need to dismiss the keyguard screen, Google design is true.
+        boolean shouldDismissKeyguard = (mInCallActivity != null &&
+                mInCallActivity.getResources().getBoolean(R.bool.config_incall_dismiss_keyguard));
+        if (isActivityStarted() && shouldDismissKeyguard) {
             mInCallActivity.dismissKeyguard(false);
         }
     }
diff --git a/src/com/android/incallui/MSimInCallActivity.java b/src/com/android/incallui/MSimInCallActivity.java
index a8350af2..42a26be5 100644
--- a/src/com/android/incallui/MSimInCallActivity.java
+++ b/src/com/android/incallui/MSimInCallActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved.
  * Not a Contribution.
  *
  * Copyright (C) 2006 The Android Open Source Project
@@ -61,7 +61,6 @@ public class MSimInCallActivity extends InCallActivity {
         // Have the WindowManager filter out touch events that are "too fat".
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
                 | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
-                | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
                 | WindowManager.LayoutParams.FLAG_IGNORE_CHEEK_PRESSES);
 
         setTheme(R.style.InCallScreenWithActionBar);