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

Merge "Do not allow the FalsingManager sesion to start when AOD is showing." into qt-dev

Browse Source 
am: 000415be6e

Change-Id: I6a34fb8a15e1117c0620785a9562ffb3ad6fa76d
This commit is contained in:
Dave Mankoff
2019-07-27 04:45:38 -07:00
committed by android-build-merger
parent 327af0ecc6 000415be6e
commit cc87595ed5
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

@@ -44,6 +44,8 @@ public class BrightLineFalsingManager implements FalsingManager {
private final SensorManager mSensorManager; private final SensorManager mSensorManager;
private final FalsingDataProvider mDataProvider; private final FalsingDataProvider mDataProvider;
private boolean mSessionStarted; private boolean mSessionStarted;
private boolean mShowingAod;
private boolean mScreenOn;
private final ExecutorService mBackgroundExecutor = Executors.newSingleThreadExecutor(); private final ExecutorService mBackgroundExecutor = Executors.newSingleThreadExecutor();
@@ -98,7 +100,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();
@@ -159,6 +161,7 @@ public class BrightLineFalsingManager implements FalsingManager {
@Override @Override
public void onSucccessfulUnlock() { public void onSucccessfulUnlock() {
sessionEnd();
} }
@Override @Override
@@ -167,6 +170,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 {
@@ -251,7 +255,7 @@ public class BrightLineFalsingManager implements FalsingManager {
@Override @Override
public void onScreenOnFromTouch() { public void onScreenOnFromTouch() {
sessionStart(); onScreenTurningOn();
} }
@Override @Override
@@ -273,11 +277,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();
} }