From 0ae8f2e36a6c86d54585fd57d55e184b0d99de1c Mon Sep 17 00:00:00 2001 From: Dave Mankoff Date: Wed, 24 Jul 2019 18:06:44 -0400 Subject: [PATCH] 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 --- .../brightline/BrightLineFalsingManager.java | 10 ++++++---- 1 file 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 3d869bcc2e4b0..6280c9f7c00f0 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() {