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

Commit 04d86dff authored by Ilya Matyukhin's avatar Ilya Matyukhin Committed by Android (Google) Code Review
Browse files

Merge changes from topic "update-pointer-context" 

* changes:
  Rename AoD to Aod
  Adjust TestHal.java to the updated PointerContext
parents 5edd17ec c05df41a

services/core/java/com/android/server/biometrics/log/BiometricContext.java

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public interface BiometricContext { 
    @Nullable Integer getBiometricPromptSessionId();



    /** If the display is in AOD. */

    boolean isAoD();

    boolean isAod();



    /**

     * Subscribe to context changes.

services/core/java/com/android/server/biometrics/log/BiometricContextProvider.java

+3 −3
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ class BiometricContextProvider implements BiometricContext { 
    @Override

    public OperationContext updateContext(@NonNull OperationContext operationContext,

            boolean isCryptoOperation) {

        operationContext.isAoD = isAoD();

        operationContext.isAod = isAod();

        operationContext.isCrypto = isCryptoOperation;

        setFirstSessionId(operationContext);

        return operationContext;
@@ -160,7 +160,7 @@ class BiometricContextProvider implements BiometricContext { 
    }



    @Override

    public boolean isAoD() {

    public boolean isAod() {

        return mIsDozing && mAmbientDisplayConfiguration.alwaysOnEnabled(UserHandle.USER_CURRENT);

    }
@@ -177,7 +177,7 @@ class BiometricContextProvider implements BiometricContext { 


    private void notifySubscribers() {

        mSubscribers.forEach((context, consumer) -> {

            context.isAoD = isAoD();

            context.isAod = isAod();

            consumer.accept(context);

        });

    }

services/core/java/com/android/server/biometrics/log/BiometricFrameworkStatsLogger.java

+3 −3
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public class BiometricFrameworkStatsLogger { 
                -1 /* sensorId */,

                operationContext.id,

                sessionType(operationContext.reason),

                operationContext.isAoD);

                operationContext.isAod);

    }



    /** {@see FrameworkStatsLog.BIOMETRIC_AUTHENTICATED}. */
@@ -77,7 +77,7 @@ public class BiometricFrameworkStatsLogger { 
                ambientLightLux,

                operationContext.id,

                sessionType(operationContext.reason),

                operationContext.isAoD);

                operationContext.isAod);

    }



    /** {@see FrameworkStatsLog.BIOMETRIC_ENROLLED}. */
@@ -109,7 +109,7 @@ public class BiometricFrameworkStatsLogger { 
                -1 /* sensorId */,

                operationContext.id,

                sessionType(operationContext.reason),

                operationContext.isAoD);

                operationContext.isAod);

    }



    /** {@see FrameworkStatsLog.BIOMETRIC_SYSTEM_HEALTH_ISSUE_DETECTED}. */

services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ class FingerprintAuthenticationClient extends AuthenticationClient<AidlSession> 
                context.y = y;

                context.minor = minor;

                context.major = major;

                context.isAoD = getBiometricContext().isAoD();

                context.isAod = getBiometricContext().isAod();

                session.getSession().onPointerDownWithContext(context);

            } else {

                session.getSession().onPointerDown(0 /* pointerId */, x, y, minor, major);

services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClient.java

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ class FingerprintEnrollClient extends EnrollClient<AidlSession> implements Udfps 
                context.y = y;

                context.minor = minor;

                context.major = major;

                context.isAoD = getBiometricContext().isAoD();

                context.isAod = getBiometricContext().isAod();

                session.getSession().onPointerDownWithContext(context);

            } else {

                session.getSession().onPointerDown(0 /* pointerId */, x, y, minor, major);