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

Merge "Assume all touches are valid after face auth" into qt-dev

Browse Source
This commit is contained in:
Kevin Chyn
2019-05-09 01:57:55 +00:00
committed by Android (Google) Code Review
parent 6c87ec4022 7e35d14037
commit 7339b6cfa1
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerImpl.java
View File

@@ -22,6 +22,7 @@ import android.hardware.Sensor;
import android.hardware.SensorEvent; import android.hardware.SensorEvent;
import android.hardware.SensorEventListener; import android.hardware.SensorEventListener;
import android.hardware.SensorManager; import android.hardware.SensorManager;
import android.hardware.biometrics.BiometricSourceType;
import android.net.Uri; import android.net.Uri;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
@@ -33,6 +34,8 @@ import android.view.MotionEvent;
import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityManager;
import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.MetricsLogger;
import com.android.keyguard.KeyguardUpdateMonitor;
import com.android.keyguard.KeyguardUpdateMonitorCallback;
import com.android.systemui.Dependency; import com.android.systemui.Dependency;
import com.android.systemui.UiOffloadThread; import com.android.systemui.UiOffloadThread;
import com.android.systemui.analytics.DataCollector; import com.android.systemui.analytics.DataCollector;
@@ -80,6 +83,7 @@ public class FalsingManagerImpl implements FalsingManagerFactory.FalsingManager
private boolean mBouncerOffOnDown = false; private boolean mBouncerOffOnDown = false;
private boolean mSessionActive = false; private boolean mSessionActive = false;
private boolean mIsTouchScreen = true; private boolean mIsTouchScreen = true;
private boolean mJustUnlockedWithFace = false;
private int mState = StatusBarState.SHADE; private int mState = StatusBarState.SHADE;
private boolean mScreenOn; private boolean mScreenOn;
private boolean mShowingAod; private boolean mShowingAod;
@@ -120,6 +124,17 @@ public class FalsingManagerImpl implements FalsingManagerFactory.FalsingManager
updateConfiguration(); updateConfiguration();
} }
}; };
private final KeyguardUpdateMonitorCallback mKeyguardUpdateCallback =
new KeyguardUpdateMonitorCallback() {
@Override
public void onBiometricAuthenticated(int userId,
BiometricSourceType biometricSourceType) {
if (userId == KeyguardUpdateMonitor.getCurrentUser()
&& biometricSourceType == BiometricSourceType.FACE) {
mJustUnlockedWithFace = true;
}
}
};
FalsingManagerImpl(Context context) { FalsingManagerImpl(Context context) {
mContext = context; mContext = context;
@@ -138,6 +153,7 @@ public class FalsingManagerImpl implements FalsingManagerFactory.FalsingManager
updateConfiguration(); updateConfiguration();
Dependency.get(StatusBarStateController.class).addCallback(mStatusBarStateListener); Dependency.get(StatusBarStateController.class).addCallback(mStatusBarStateListener);
KeyguardUpdateMonitor.getInstance(context).registerCallback(mKeyguardUpdateCallback);
} }
private void updateConfiguration() { private void updateConfiguration() {
@@ -199,6 +215,7 @@ public class FalsingManagerImpl implements FalsingManagerFactory.FalsingManager
} }
mBouncerOn = false; mBouncerOn = false;
mSessionActive = true; mSessionActive = true;
mJustUnlockedWithFace = false;
mIsFalseTouchCalls = 0; mIsFalseTouchCalls = 0;
if (mHumanInteractionClassifier.isEnabled()) { if (mHumanInteractionClassifier.isEnabled()) {
@@ -285,6 +302,11 @@ public class FalsingManagerImpl implements FalsingManagerFactory.FalsingManager
// anti-falsed. // anti-falsed.
return false; return false;
} }
if (mJustUnlockedWithFace) {
// Unlocking with face is a strong user presence signal, we can assume the user
// is present until the next session starts.
return false;
}
mIsFalseTouchCalls++; mIsFalseTouchCalls++;
boolean isFalse = mHumanInteractionClassifier.isFalseTouch(); boolean isFalse = mHumanInteractionClassifier.isFalseTouch();
if (!isFalse) { if (!isFalse) {