Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not allow the FalsingManager sesion to start when AOD is showing.

Browse Source 
Bug: 138220274
Test: manual

Change-Id: I6d14db66d53a668b7cf8dd15ebb489fb3ebf4c7c
Merged-In: I6d14db66d53a668b7cf8dd15ebb489fb3ebf4c7c
This commit is contained in:
Dave Mankoff
2019-07-26 13:50:08 -04:00
parent 55a5388280
commit 622eeaf0d5
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/classifier/brightline/BrightLineFalsingManager.java
View File

@@ -50,6 +50,8 @@ public class BrightLineFalsingManager implements FalsingManager {
private boolean mSessionStarted; private boolean mSessionStarted;
private MetricsLogger mMetricsLogger; private MetricsLogger mMetricsLogger;
private int mIsFalseTouchCalls; private int mIsFalseTouchCalls;
private boolean mShowingAod;
private boolean mScreenOn;
private final ExecutorService mBackgroundExecutor = Executors.newSingleThreadExecutor(); private final ExecutorService mBackgroundExecutor = Executors.newSingleThreadExecutor();
@@ -105,7 +107,7 @@ public class BrightLineFalsingManager implements FalsingManager {
} }
private void sessionStart() { private void sessionStart() {
if (!mSessionStarted) { if (!mSessionStarted && !mShowingAod && mScreenOn) {
logDebug("Starting Session"); logDebug("Starting Session");
mSessionStarted = true; mSessionStarted = true;
registerSensors(); registerSensors();
@@ -174,6 +176,7 @@ public class BrightLineFalsingManager implements FalsingManager {
mMetricsLogger.histogram(FALSING_SUCCESS, mIsFalseTouchCalls); mMetricsLogger.histogram(FALSING_SUCCESS, mIsFalseTouchCalls);
mIsFalseTouchCalls = 0; mIsFalseTouchCalls = 0;
} }
sessionEnd();
} }
@Override @Override
@@ -182,6 +185,7 @@ public class BrightLineFalsingManager implements FalsingManager {
@Override @Override
public void setShowingAod(boolean showingAod) { public void setShowingAod(boolean showingAod) {
mShowingAod = showingAod;
if (showingAod) { if (showingAod) {
sessionEnd(); sessionEnd();
} else { } else {
@@ -266,7 +270,7 @@ public class BrightLineFalsingManager implements FalsingManager {
@Override @Override
public void onScreenOnFromTouch() { public void onScreenOnFromTouch() {
sessionStart(); onScreenTurningOn();
} }
@Override @Override
@@ -288,11 +292,13 @@ public class BrightLineFalsingManager implements FalsingManager {
@Override @Override
public void onScreenTurningOn() { public void onScreenTurningOn() {
mScreenOn = true;
sessionStart(); sessionStart();
} }
@Override @Override
public void onScreenOff() { public void onScreenOff() {
mScreenOn = false;
sessionEnd(); sessionEnd();
} }