summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Mankoff <mankoff@google.com>2019-07-24 18:06:44 -0400
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-07-25 04:11:54 +0000
commitab3757717fcaa430cab51701382aae84f6acec90 (patch)
tree79fd5f1af5c6e9416ae95c0aa4d068dfebc0df44
parent4863f9be22cf51381017fd6c31845076f5a628b0 (diff)
downloadbase-ab3757717fcaa430cab51701382aae84f6acec90.tar.gz
Prevent the BrightLineFalsingManager from duping its session.
The BrightLineFalsingManager should not be able to start a session when it's already in a session. Primarily, this caused the FalsingManager to hang onto extra registrations to the Proximity Sensor, per the bug. Bug: 138220274 Test: atest SystemUITests and manual. Change-Id: Id10d2697a96524e98c87aaa87702209d1752fe68 (cherry picked from commit 0ae8f2e36a6c86d54585fd57d55e184b0d99de1c)
-rw-r--r--packages/SystemUI/src/com/android/systemui/classifier/brightline/BrightLineFalsingManager.java10
1 files changed, 6 insertions, 4 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 3d869bcc2e4b..6280c9f7c00f 100644
--- a/packages/SystemUI/src/com/android/systemui/classifier/brightline/BrightLineFalsingManager.java
+++ b/packages/SystemUI/src/com/android/systemui/classifier/brightline/BrightLineFalsingManager.java
@@ -98,10 +98,12 @@ public class BrightLineFalsingManager implements FalsingManager {
}
private void sessionStart() {
- logDebug("Starting Session");
- mSessionStarted = true;
- registerSensors();
- mClassifiers.forEach(FalsingClassifier::onSessionStarted);
+ if (!mSessionStarted) {
+ logDebug("Starting Session");
+ mSessionStarted = true;
+ registerSensors();
+ mClassifiers.forEach(FalsingClassifier::onSessionStarted);
+ }
}
private void sessionEnd() {