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

Commit 91d6df7d authored by Vincent Wang's avatar Vincent Wang
Browse files

Remove ignore annotation @Ignore("b/282413778") 

Use FaceUdater.enroll to avoid Proguard remove this method

Bug: 291194547
Test: atest FaceUpdaterTest
Change-Id: I3b0c5557c4b4ebab6828fae831697a2b1a4daea5
parent 0b48ffdd

src/com/android/settings/biometrics/face/FaceUpdater.java

+3 −2
Original line number Diff line number Diff line
@@ -50,8 +50,9 @@ public class FaceUpdater { 
    /** Wrapper around the {@link FaceManager#enroll} method. */

    public void enroll(int userId, byte[] hardwareAuthToken, CancellationSignal cancel,

            FaceManager.EnrollmentCallback callback, int[] disabledFeatures) {

        mFaceManager.enroll(userId, hardwareAuthToken, cancel,

                new NotifyingEnrollmentCallback(mContext, callback), disabledFeatures);

        this.enroll(userId, hardwareAuthToken, cancel,

                new NotifyingEnrollmentCallback(mContext, callback), disabledFeatures,

                null, false);

    }



    /** Wrapper around the {@link FaceManager#enroll} method. */

tests/unit/src/com/android/settings/biometrics/face/FaceUpdaterTest.java

+10 −8
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; 
import com.android.settings.safetycenter.SafetyCenterManagerWrapper;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;
@@ -100,7 +99,9 @@ public class FaceUpdaterTest { 
                same(HARDWARE_AUTH_TOKEN),

                same(CANCELLATION_SIGNAL),

                callbackCaptor.capture(),

                same(DISABLED_FEATURES));

                same(DISABLED_FEATURES),

                same(null),

                eq(false));

        FaceManager.EnrollmentCallback callback = callbackCaptor.getValue();



        callback.onEnrollmentError(ERR_MSG_ID, ERR_STRING);
@@ -126,12 +127,14 @@ public class FaceUpdaterTest { 
                same(HARDWARE_AUTH_TOKEN),

                same(CANCELLATION_SIGNAL),

                callbackCaptor.capture(),

                same(DISABLED_FEATURES));

                same(DISABLED_FEATURES),

                same(null),

                eq(false));

        FaceManager.EnrollmentCallback callback = callbackCaptor.getValue();



        callback.onEnrollmentProgress(/* remaining= */ 0);



        verify(mSafetyCenterManagerWrapper).isEnabled(mContext);

        verify(mSafetyCenterManagerWrapper, atLeast(1)).isEnabled(mContext);

    }



    @Test
@@ -145,7 +148,9 @@ public class FaceUpdaterTest { 
                same(HARDWARE_AUTH_TOKEN),

                same(CANCELLATION_SIGNAL),

                callbackCaptor.capture(),

                same(DISABLED_FEATURES));

                same(DISABLED_FEATURES),

                same(null),

                eq(false));

        FaceManager.EnrollmentCallback callback = callbackCaptor.getValue();



        callback.onEnrollmentProgress(/* remaining= */ 1);
@@ -153,7 +158,6 @@ public class FaceUpdaterTest { 
        verify(mSafetyCenterManagerWrapper, never()).isEnabled(any());

    }



    @Ignore("b/282413778")

    @Test

    public void enroll_secondVersion_onEnrollmentCallbacks_triggerGivenCallback() {

        ArgumentCaptor<FaceManager.EnrollmentCallback> callbackCaptor =
@@ -182,7 +186,6 @@ public class FaceUpdaterTest { 
                .onEnrollmentFrame(HELP_CODE, HELP_MESSAGE, CELL, STAGE, PAN, TILT, DISTANCE);

    }



    @Ignore("b/282413778")

    @Test

    public void enroll_secondVersion_onEnrollmentSuccess_invokedInteractionWithSafetyCenter() {

        ArgumentCaptor<FaceManager.EnrollmentCallback> callbackCaptor =
@@ -204,7 +207,6 @@ public class FaceUpdaterTest { 
        verify(mSafetyCenterManagerWrapper).isEnabled(mContext);

    }



    @Ignore("b/282413778")

    @Test

    public void enroll_secondVersion_onEnrollmentNotYetFinished_didntInvokeInteractionWithSafetyCenter() {

        ArgumentCaptor<FaceManager.EnrollmentCallback> callbackCaptor =