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

Commit 84535904 authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

Merge changes from topic "facemanager-bypassflag" into sc-dev am: 88a506aa 

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

Change-Id: I7d27fc16814e25da0d0b5eaa92d43073aedb8d42
parents c06c8b57 88a506aa

core/java/android/hardware/face/FaceManager.java

+4 −27
Original line number Diff line number Diff line
@@ -168,31 +168,6 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan 
        mHandler = new MyHandler(context);

    }



    /**

     * Request authentication of a crypto object. This call operates the face recognition hardware

     * and starts capturing images. It terminates when

     * {@link AuthenticationCallback#onAuthenticationError(int, CharSequence)} or

     * {@link AuthenticationCallback#onAuthenticationSucceeded(AuthenticationResult)} is called, at

     * which point the object is no longer valid. The operation can be canceled by using the

     * provided cancel object.

     *

     * @param crypto   object associated with the call or null if none required.

     * @param cancel   an object that can be used to cancel authentication

     * @param callback an object to receive authentication events

     * @param handler  an optional handler to handle callback events

     * @throws IllegalArgumentException if the crypto operation is not supported or is not backed

     *                                  by

     *                                  <a href="{@docRoot}training/articles/keystore.html">Android

     *                                  Keystore facility</a>.

     * @throws IllegalStateException    if the crypto primitive is not initialized.

     * @hide

     */

    @RequiresPermission(USE_BIOMETRIC_INTERNAL)

    public void authenticate(@Nullable CryptoObject crypto, @Nullable CancellationSignal cancel,

            @NonNull AuthenticationCallback callback, @Nullable Handler handler) {

        authenticate(crypto, cancel, callback, handler, mContext.getUserId());

    }



    /**

     * Use the provided handler thread for events.

     */
@@ -224,8 +199,10 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan 
     * @throws IllegalStateException    if the crypto primitive is not initialized.

     * @hide

     */

    @RequiresPermission(USE_BIOMETRIC_INTERNAL)

    public void authenticate(@Nullable CryptoObject crypto, @Nullable CancellationSignal cancel,

            @NonNull AuthenticationCallback callback, @Nullable Handler handler, int userId) {

            @NonNull AuthenticationCallback callback, @Nullable Handler handler, int userId,

            boolean isKeyguardBypassEnabled) {

        if (callback == null) {

            throw new IllegalArgumentException("Must supply an authentication callback");

        }
@@ -247,7 +224,7 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan 
                final long operationId = crypto != null ? crypto.getOpId() : 0;

                Trace.beginSection("FaceManager#authenticate");

                mService.authenticate(mToken, operationId, userId, mServiceReceiver,

                        mContext.getOpPackageName());

                        mContext.getOpPackageName(), isKeyguardBypassEnabled);

            } catch (RemoteException e) {

                Slog.w(TAG, "Remote exception while authenticating: ", e);

                if (callback != null) {

core/java/android/hardware/face/IFaceService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ interface IFaceService { 


    // Authenticate the given sessionId with a face

    void authenticate(IBinder token, long operationId, int userId, IFaceServiceReceiver receiver,

            String opPackageName);

            String opPackageName, boolean isKeyguardBypassEnabled);



    // Uses the face hardware to detect for the presence of a face, without giving details

    // about accept/reject/lockout.

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+3 −1
Original line number Diff line number Diff line
@@ -2407,8 +2407,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
            if (isEncryptedOrLockdown(userId) && supportsFaceDetection) {

                mFaceManager.detectFace(mFaceCancelSignal, mFaceDetectionCallback, userId);

            } else {

                final boolean isBypassEnabled = mKeyguardBypassController != null

                        && mKeyguardBypassController.isBypassEnabled();

                mFaceManager.authenticate(null /* crypto */, mFaceCancelSignal,

                        mFaceAuthenticationCallback, null /* handler */, userId);

                        mFaceAuthenticationCallback, null /* handler */, userId, isBypassEnabled);

            }

            setFaceRunningState(BIOMETRIC_STATE_RUNNING);

        }

packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java

+18 −12
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
    public void testTriesToAuthenticate_whenBouncer() {

        setKeyguardBouncerVisibility(true);



        verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt());

        verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt(), anyBoolean());

        verify(mFaceManager).isHardwareDetected();

        verify(mFaceManager).hasEnrolledTemplates(anyInt());

    }
@@ -523,7 +523,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        mKeyguardUpdateMonitor.dispatchStartedWakingUp();

        mTestableLooper.processAllMessages();

        mKeyguardUpdateMonitor.onKeyguardVisibilityChanged(true);

        verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt());

        verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt(), anyBoolean());

    }



    @Test
@@ -533,7 +533,8 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        mTestableLooper.processAllMessages();



        mKeyguardUpdateMonitor.onKeyguardVisibilityChanged(true);

        verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt());

        verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt(),

                anyBoolean());

    }



    @Test
@@ -545,7 +546,8 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        mKeyguardUpdateMonitor.dispatchStartedWakingUp();

        mTestableLooper.processAllMessages();

        mKeyguardUpdateMonitor.onKeyguardVisibilityChanged(true);

        verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt());

        verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt(),

                anyBoolean());

    }



    @Test
@@ -568,13 +570,14 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        mKeyguardUpdateMonitor.dispatchStartedWakingUp();

        mTestableLooper.processAllMessages();

        mKeyguardUpdateMonitor.onKeyguardVisibilityChanged(true);

        verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt());

        verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt(), anyBoolean());



        // Stop scanning when bouncer becomes visible

        setKeyguardBouncerVisibility(true);

        clearInvocations(mFaceManager);

        mKeyguardUpdateMonitor.requestFaceAuth(true);

        verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt());

        verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt(),

                anyBoolean());

    }



    @Test
@@ -582,7 +585,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        mKeyguardUpdateMonitor.setKeyguardOccluded(true);

        mKeyguardUpdateMonitor.setAssistantVisible(true);



        verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt());

        verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt(), anyBoolean());

    }



    @Test
@@ -594,7 +597,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        mKeyguardUpdateMonitor.onTrustChanged(true /* enabled */,

                KeyguardUpdateMonitor.getCurrentUser(), 0 /* flags */);

        mKeyguardUpdateMonitor.onKeyguardVisibilityChanged(true);

        verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt());

        verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt(), anyBoolean());

    }



    @Test
@@ -604,7 +607,8 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        mKeyguardUpdateMonitor.onTrustChanged(true /* enabled */,

                KeyguardUpdateMonitor.getCurrentUser(), 0 /* flags */);

        mKeyguardUpdateMonitor.onKeyguardVisibilityChanged(true);

        verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt());

        verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt(),

                anyBoolean());

    }



    @Test
@@ -615,7 +619,8 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
                KeyguardUpdateMonitor.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN);



        mKeyguardUpdateMonitor.onKeyguardVisibilityChanged(true);

        verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt());

        verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt(),

                anyBoolean());

    }



    @Test
@@ -626,7 +631,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
                KeyguardUpdateMonitor.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_LOCKOUT);



        mKeyguardUpdateMonitor.onKeyguardVisibilityChanged(true);

        verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt());

        verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt(), anyBoolean());

    }



    @Test
@@ -638,7 +643,8 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        mKeyguardUpdateMonitor.sendKeyguardBouncerChanged(true);

        mTestableLooper.processAllMessages();



        verify(mFaceManager, never()).authenticate(any(), any(), any(), any());

        verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt(),

                anyBoolean());

    }



    @Test

services/core/java/com/android/server/biometrics/BiometricService.java

+2 −3
Original line number Diff line number Diff line
@@ -1103,9 +1103,8 @@ public class BiometricService extends SystemService { 
        }



        public boolean isAdvancedCoexLogicEnabled(Context context) {

            return (Build.IS_USERDEBUG || Build.IS_ENG)

                    && Settings.Secure.getInt(context.getContentResolver(),

                    CoexCoordinator.SETTING_ENABLE_NAME, 0) != 0;

            return Settings.Secure.getInt(context.getContentResolver(),

                    CoexCoordinator.SETTING_ENABLE_NAME, 1) != 0;

        }

    }