commit 9c327dac16eeb5bdf1a28eb64ce0c9ac7b73158c
author linyuh <linyuh@google.com> Tue Nov 14 12:33:48 2017 -0800
committer zachh <zachh@google.com> Sat Nov 18 07:27:14 2017 +0000
tree bee26535d26c2f177f9fa0b84da707633f92ef69
parent c7b413058c765603d5c65d39e4042a55ab170ef0

Move InCallActivityCommon#dismissKeyGuard to InCallActivity.

This is part of the effort to delete InCallActivityCommon. There are 25 references to InCallActivityCommon in InCallActivity and we will remove them one at a time.

Bug: 69272096
Test: None
PiperOrigin-RevId: 175718978
Change-Id: I0713bd28c2d34791045be2bb851003000b88abca

java/com/android/incallui/InCallActivity.java

diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java
index cdab6b4..9353469 100644
--- a/java/com/android/incallui/InCallActivity.java
+++ b/java/com/android/incallui/InCallActivity.java
@@ -34,6 +34,7 @@
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.WindowManager;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.ThreadUtil;
@@ -90,6 +91,7 @@
   private boolean didShowAnswerScreen;
   private boolean didShowInCallScreen;
   private boolean didShowVideoCallScreen;
+  private boolean dismissKeyguard;
   private int[] backgroundDrawableColors;
   private GradientDrawable backgroundDrawable;
   private boolean isVisible;
@@ -419,7 +421,16 @@
   }
 
   public void dismissKeyguard(boolean dismiss) {
-    common.dismissKeyguard(dismiss);
+    if (dismissKeyguard == dismiss) {
+      return;
+    }
+
+    dismissKeyguard = dismiss;
+    if (dismiss) {
+      getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
+    } else {
+      getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
+    }
   }
 
   public void showPostCharWaitDialog(String callId, String chars) {