diff options
author | Dave Mankoff <mankoff@google.com> | 2019-07-26 13:50:08 -0400 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-28 22:25:59 +0000 |
commit | 573488ed81ab2f7d56af14392010cbd51d206e74 (patch) | |
tree | 523f9e67e216424faa409592c761eb28b427cb69 | |
parent | a45d6a7e845b620563313557f5cc2695bf90ac36 (diff) | |
download | base-573488ed81ab2f7d56af14392010cbd51d206e74.tar.gz |
Do not allow the FalsingManager sesion to start when AOD is showing.
Bug: 138220274
Test: manual
Change-Id: I6d14db66d53a668b7cf8dd15ebb489fb3ebf4c7c
Merged-In: I6d14db66d53a668b7cf8dd15ebb489fb3ebf4c7c
(cherry picked from commit bbc11cafee6fb1bf2768bc0b4befcb6f7e02d251)
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/classifier/brightline/BrightLineFalsingManager.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/classifier/brightline/BrightLineFalsingManager.java b/packages/SystemUI/src/com/android/systemui/classifier/brightline/BrightLineFalsingManager.java index 6280c9f7c00f..fbbba57381c6 100644 --- a/packages/SystemUI/src/com/android/systemui/classifier/brightline/BrightLineFalsingManager.java +++ b/packages/SystemUI/src/com/android/systemui/classifier/brightline/BrightLineFalsingManager.java @@ -44,6 +44,8 @@ public class BrightLineFalsingManager implements FalsingManager { private final SensorManager mSensorManager; private final FalsingDataProvider mDataProvider; private boolean mSessionStarted; + private boolean mShowingAod; + private boolean mScreenOn; private final ExecutorService mBackgroundExecutor = Executors.newSingleThreadExecutor(); @@ -98,7 +100,7 @@ public class BrightLineFalsingManager implements FalsingManager { } private void sessionStart() { - if (!mSessionStarted) { + if (!mSessionStarted && !mShowingAod && mScreenOn) { logDebug("Starting Session"); mSessionStarted = true; registerSensors(); @@ -159,6 +161,7 @@ public class BrightLineFalsingManager implements FalsingManager { @Override public void onSucccessfulUnlock() { + sessionEnd(); } @Override @@ -167,6 +170,7 @@ public class BrightLineFalsingManager implements FalsingManager { @Override public void setShowingAod(boolean showingAod) { + mShowingAod = showingAod; if (showingAod) { sessionEnd(); } else { @@ -251,7 +255,7 @@ public class BrightLineFalsingManager implements FalsingManager { @Override public void onScreenOnFromTouch() { - sessionStart(); + onScreenTurningOn(); } @Override @@ -273,11 +277,13 @@ public class BrightLineFalsingManager implements FalsingManager { @Override public void onScreenTurningOn() { + mScreenOn = true; sessionStart(); } @Override public void onScreenOff() { + mScreenOn = false; sessionEnd(); } |