commit df75bbb32ffd4a6a172f5aaeee610c6b8d824405
author Julia Tuttle <juliatuttle@google.com> Wed May 08 15:33:34 2024 -0400
committer Julia Tuttle <juliatuttle@google.com> Fri May 10 11:55:59 2024 -0400
tree d441a6ac12ee3afcc9982b4f6ddaf5ac10e0d3ab
parent df94c034b58ee8f0a98751634e2b03404da1cdb2

FalsingCollectorImpl: refactor shouldBeRegisteredToSensors

Bug: 330492016
Test: atest FalsingCollectorImplTest
Flag: NA
Change-Id: Ifded1740fefc478ce756808441f00c6320ad9b0e

packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorImpl.java

diff --git a/packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorImpl.java b/packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorImpl.java
index b42a903..5653bc2 100644
--- a/packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorImpl.java
@@ -399,12 +399,13 @@
     }
 
     private boolean shouldBeRegisteredToSensors() {
-        return mScreenOn
-                && (mState == StatusBarState.KEYGUARD
-                || (mState == StatusBarState.SHADE
-                && mKeyguardStateController.isOccluded()
-                && mKeyguardStateController.isShowing()))
-                && !mShowingAod;
+        final boolean isKeyguard = mState == StatusBarState.KEYGUARD;
+
+        final boolean isShadeOverOccludedKeyguard = mState == StatusBarState.SHADE
+                && mKeyguardStateController.isShowing()
+                && mKeyguardStateController.isOccluded();
+
+        return mScreenOn && !mShowingAod && (isKeyguard || isShadeOverOccludedKeyguard);
     }
 
     private void updateSensorRegistration() {