The big keyguard transition refactor (6/n)
Cleanup:
- Make sure all the state is nicely dumped.
- Remove some unused stuff.
- Fix a flicker when occluded -> unlocked
Bug: 32057734
Change-Id: Id87e26adccef740d608b325c2dc1f6db14dd4ec3
diff --git a/services/core/java/com/android/server/am/KeyguardController.java b/services/core/java/com/android/server/am/KeyguardController.java
index 2c8a8aa..98acc9c 100644
--- a/services/core/java/com/android/server/am/KeyguardController.java
+++ b/services/core/java/com/android/server/am/KeyguardController.java
@@ -31,6 +31,7 @@
import com.android.server.wm.WindowManagerService;
+import java.io.PrintWriter;
import java.util.ArrayList;
/**
@@ -44,8 +45,8 @@
private final ActivityManagerService mService;
private final ActivityStackSupervisor mStackSupervisor;
private WindowManagerService mWindowManager;
- private boolean mKeyguardGoingAway;
private boolean mKeyguardShowing;
+ private boolean mKeyguardGoingAway;
private boolean mOccluded;
private ActivityRecord mDismissingKeyguardActivity;
private int mBeforeUnoccludeTransit;
@@ -256,4 +257,13 @@
mStackSupervisor.mFocusedStack.getStackId() == DOCKED_STACK_ID);
}
}
+
+ void dump(PrintWriter pw, String prefix) {
+ pw.println(prefix + "KeyguardController:");
+ pw.println(prefix + " mKeyguardShowing=" + mKeyguardShowing);
+ pw.println(prefix + " mKeyguardGoingAway=" + mKeyguardGoingAway);
+ pw.println(prefix + " mOccluded=" + mOccluded);
+ pw.println(prefix + " mDismissingKeyguardActivity=" + mDismissingKeyguardActivity);
+ pw.println(prefix + " mVisibilityTransactionDepth=" + mVisibilityTransactionDepth);
+ }
}