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

Commit 7abe135f authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Add PointerCountClassifier to the BrightLineFalsingManager. 

False on the lock screen if more than one pointer is detected.

Bug: 111394067
Test: atest SystemUITests
Change-Id: Ibffc78d024644adfcfa2713083b03795a11cecb6
parent 07fb7b73

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

+2 −1
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ public class BrightLineFalsingManager implements FalsingManager { 
        mDataProvider = falsingDataProvider;

        mSensorManager = sensorManager;

        mClassifiers = new ArrayList<>();

        // TODO: add classifiers here.



        mClassifiers.add(new PointerCountClassifier(mDataProvider));

    }



    private void registerSensors() {

packages/SystemUI/src/com/android/systemui/classifier/brightline/PointerCountClassifier.java

0 → 100644
+53 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.classifier.brightline;



import android.view.MotionEvent;



/**

 * False touch if more than one finger touches the screen.

 *

 * IMPORTANT: This should not be used for certain cases (i.e. a11y) as we expect multiple fingers

 * for them.

 */

class PointerCountClassifier extends FalsingClassifier {



    private static final int MAX_ALLOWED_POINTERS = 1;

    private int mMaxPointerCount;



    PointerCountClassifier(FalsingDataProvider dataProvider) {

        super(dataProvider);

    }



    @Override

    public void onTouchEvent(MotionEvent motionEvent) {

        int pCount = mMaxPointerCount;

        if (motionEvent.getActionMasked() == MotionEvent.ACTION_DOWN) {

            mMaxPointerCount = motionEvent.getPointerCount();

        } else {

            mMaxPointerCount = Math.max(mMaxPointerCount, motionEvent.getPointerCount());

        }

        if (pCount != mMaxPointerCount) {

            logDebug("Pointers observed:" + mMaxPointerCount);

        }

    }



    @Override

    public boolean isFalseTouch() {

        return mMaxPointerCount > MAX_ALLOWED_POINTERS;

    }

}

packages/SystemUI/tests/src/com/android/systemui/classifier/brightline/PointerCountClassifierTest.java

0 → 100644
+77 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.classifier.brightline;



import static org.hamcrest.CoreMatchers.is;

import static org.junit.Assert.assertThat;



import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.view.MotionEvent;



import androidx.test.filters.SmallTest;



import com.android.systemui.SysuiTestCase;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;



@SmallTest

@RunWith(AndroidTestingRunner.class)

@TestableLooper.RunWithLooper

public class PointerCountClassifierTest extends SysuiTestCase {



    @Mock

    private FalsingDataProvider mDataProvider;

    private FalsingClassifier mClassifier;



    @Before

    public void setup() {

        mClassifier = new PointerCountClassifier(mDataProvider);

    }



    @Test

    public void testPass_noPointer() {

        assertThat(mClassifier.isFalseTouch(), is(false));

    }



    @Test

    public void testPass_singlePointer() {

        MotionEvent motionEvent = MotionEvent.obtain(1, 1, MotionEvent.ACTION_DOWN, 1, 1, 0);

        mClassifier.onTouchEvent(motionEvent);

        motionEvent.recycle();

        assertThat(mClassifier.isFalseTouch(), is(false));

    }



    @Test

    public void testFail_multiPointer() {

        MotionEvent.PointerProperties[] pointerProperties =

                MotionEvent.PointerProperties.createArray(2);

        pointerProperties[0].id = 0;

        pointerProperties[1].id = 1;

        MotionEvent.PointerCoords[] pointerCoords = MotionEvent.PointerCoords.createArray(2);

        MotionEvent motionEvent = MotionEvent.obtain(

                1, 1, MotionEvent.ACTION_DOWN, 2, pointerProperties, pointerCoords, 0, 0, 0, 0, 0,

                0,

                0, 0);

        mClassifier.onTouchEvent(motionEvent);

        motionEvent.recycle();

        assertThat(mClassifier.isFalseTouch(), is(true));

    }

}