Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 401caaed authored Mar 04, 2016 by Adrian Roos

Fix bug and add logging in FalsingManager

Fixes bug that lead FalsingManager to be incorrect
about the screen on state.

Makes it a fatal error to query whether a touch is
falsing outside of an active session.

Prevents touch collection and logging on the locked
shade which needs no anti-falsing.

Bug: 27227578
Change-Id: I8e330ad28636156a952e61b8fe6a3d201f82e624

parent c04cf4ba

packages/SystemUI/src/com/android/systemui/classifier/AccelerationClassifier.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -35,6 +35,11 @@ public class AccelerationClassifier extends StrokeClassifier {
	mClassifierData = classifierData;		mClassifierData = classifierData;
	}		}

			@Override
			public String getTag() {
			return "ACC";
			}

	@Override		@Override
	public void onTouchEvent(MotionEvent event) {		public void onTouchEvent(MotionEvent event) {
	int action = event.getActionMasked();		int action = event.getActionMasked();

packages/SystemUI/src/com/android/systemui/classifier/AnglesClassifier.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -53,6 +53,11 @@ public class AnglesClassifier extends StrokeClassifier {
	mClassifierData = classifierData;		mClassifierData = classifierData;
	}		}

			@Override
			public String getTag() {
			return "ANG";
			}

	@Override		@Override
	public void onTouchEvent(MotionEvent event) {		public void onTouchEvent(MotionEvent event) {
	int action = event.getActionMasked();		int action = event.getActionMasked();

packages/SystemUI/src/com/android/systemui/classifier/Classifier.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -48,4 +48,6 @@ public abstract class Classifier {
	*/		*/
	public void onSensorChanged(SensorEvent event) {		public void onSensorChanged(SensorEvent event) {
	}		}

			public abstract String getTag();
	}		}

packages/SystemUI/src/com/android/systemui/classifier/DirectionClassifier.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -24,6 +24,11 @@ public class DirectionClassifier extends StrokeClassifier {
	public DirectionClassifier(ClassifierData classifierData) {		public DirectionClassifier(ClassifierData classifierData) {
	}		}

			@Override
			public String getTag() {
			return "DIR";
			}

	@Override		@Override
	public float getFalseTouchEvaluation(int type, Stroke stroke) {		public float getFalseTouchEvaluation(int type, Stroke stroke) {
	Point firstPoint = stroke.getPoints().get(0);		Point firstPoint = stroke.getPoints().get(0);

packages/SystemUI/src/com/android/systemui/classifier/DurationCountClassifier.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -24,6 +24,11 @@ public class DurationCountClassifier extends StrokeClassifier {
	public DurationCountClassifier(ClassifierData classifierData) {		public DurationCountClassifier(ClassifierData classifierData) {
	}		}

			@Override
			public String getTag() {
			return "DUR";
			}

	@Override		@Override
	public float getFalseTouchEvaluation(int type, Stroke stroke) {		public float getFalseTouchEvaluation(int type, Stroke stroke) {
	return DurationCountEvaluator.evaluate(stroke.getDurationSeconds() / stroke.getCount());		return DurationCountEvaluator.evaluate(stroke.getDurationSeconds() / stroke.getCount());