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

Commit 094ca455 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove haptic feedback from face detect operations." into udc-dev am:... 

Merge "Remove haptic feedback from face detect operations." into udc-dev am: 31fcf5ce am: 4ea177db am: 3f3efff8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23304676



Change-Id: I71cb3247176bc264f28a62f3fb4a71d07f93e7fb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a9a34b36 3f3efff8

services/core/java/com/android/server/biometrics/sensors/AcquisitionClient.java

+0 −11
Original line number Diff line number Diff line
@@ -206,17 +206,6 @@ public abstract class AcquisitionClient<T> extends HalClientMonitor<T> implement 
        }

    }



    protected final void vibrateError() {

        Vibrator vibrator = getContext().getSystemService(Vibrator.class);

        if (vibrator != null && mShouldVibrate) {

            vibrator.vibrate(Process.myUid(),

                    getContext().getOpPackageName(),

                    ERROR_VIBRATION_EFFECT,

                    getClass().getSimpleName() + "::error",

                    HARDWARE_FEEDBACK_VIBRATION_ATTRIBUTES);

        }

    }



    @Override

    public boolean isInterruptable() {

        return true;

services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceDetectClient.java

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public class FaceDetectClient extends AcquisitionClient<AidlSession> implements 
            boolean isStrongBiometric, SensorPrivacyManager sensorPrivacyManager) {

        super(context, lazyDaemon, token, listener, options.getUserId(),

                options.getOpPackageName(), 0 /* cookie */, options.getSensorId(),

                true /* shouldVibrate */, logger, biometricContext);

                false /* shouldVibrate */, logger, biometricContext);

        setRequestId(requestId);

        mIsStrongBiometric = isStrongBiometric;

        mSensorPrivacyManager = sensorPrivacyManager;

services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceDetectClientTest.java

+16 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static org.mockito.Mockito.inOrder; 
import static org.mockito.Mockito.never;

import static org.mockito.Mockito.same;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verifyZeroInteractions;

import static org.mockito.Mockito.when;



import android.hardware.biometrics.common.AuthenticateReason;
@@ -34,6 +35,7 @@ import android.hardware.face.FaceAuthenticateOptions; 
import android.os.IBinder;

import android.os.PowerManager;

import android.os.RemoteException;

import android.os.Vibrator;

import android.platform.test.annotations.Presubmit;

import android.testing.TestableContext;
@@ -75,6 +77,8 @@ public class FaceDetectClientTest { 
    @Mock

    private IBinder mToken;

    @Mock

    private Vibrator mVibrator;

    @Mock

    private ClientMonitorCallbackConverter mClientMonitorCallbackConverter;

    @Mock

    private BiometricLogger mBiometricLogger;
@@ -94,6 +98,8 @@ public class FaceDetectClientTest { 


    @Before

    public void setup() {

        mContext.addMockSystemService(Vibrator.class, mVibrator);



        when(mBiometricContext.updateContext(any(), anyBoolean())).thenAnswer(

                i -> i.getArgument(0));

    }
@@ -147,6 +153,16 @@ public class FaceDetectClientTest { 
        verify(mBiometricContext).unsubscribe(same(mOperationContextCaptor.getValue()));

    }



    @Test

    public void doesNotPlayHapticOnInteractionDetected() throws Exception {

        final FaceDetectClient client = createClient();

        client.start(mCallback);

        client.onInteractionDetected();

        client.stopHalOperation();



        verifyZeroInteractions(mVibrator);

    }



    private FaceDetectClient createClient() throws RemoteException {

        return createClient(100 /* version */);

    }