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

Commit 0ea20eac authored by Ilya Matyukhin's avatar Ilya Matyukhin Committed by Automerger Merge Worker
Browse files

Merge "Enable RRS (FHD<->QHD) support for UDFPS" into tm-dev am: 559244bd 

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



Change-Id: I9cea72409a35ba85360da4c343491abadbde9f66
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2014d89f 559244bd

core/java/android/hardware/biometrics/SensorLocationInternal.java

+9 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ package android.hardware.biometrics; 




import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.graphics.Rect;

import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;
@@ -109,4 +110,12 @@ public class SensorLocationInternal implements Parcelable { 
                + ", y: " + sensorLocationY

                + ", y: " + sensorLocationY

                + ", r: " + sensorRadius + "]";

                + ", r: " + sensorRadius + "]";

    }

    }



    /** Returns coordinates of a bounding box around the sensor. */

    public Rect getRect() {

        return new Rect(sensorLocationX - sensorRadius,

                sensorLocationY - sensorRadius,

                sensorLocationX + sensorRadius,

                sensorLocationY + sensorRadius);

    }

}
 
}

core/java/android/util/RotationUtils.java

+25 −13
Original line number Original line Diff line number Diff line
@@ -88,14 +88,14 @@ public class RotationUtils { 
    }

    }





    /**

    /**

     * Rotates bounds as if parentBounds and bounds are a group. The group is rotated by `delta`

     * Rotates inOutBounds together with the parent for a given rotation delta. This assumes that

     * 90-degree counter-clockwise increments. This assumes that parentBounds is at 0,0 and

     * the parent starts at 0,0 and remains at 0,0 after the rotation. The inOutBounds will remain

     * remains at 0,0 after rotation. The bounds will be at the same physical position in

     * at the same physical position within the parent.

     * parentBounds.

     *

     *

     * Only 'inOutBounds' is mutated.

     * Only 'inOutBounds' is mutated.

     */

     */

    public static void rotateBounds(Rect inOutBounds, Rect parentBounds, @Rotation int rotation) {

    public static void rotateBounds(Rect inOutBounds, int parentWidth, int parentHeight,

            @Rotation int rotation) {

        final int origLeft = inOutBounds.left;

        final int origLeft = inOutBounds.left;

        final int origTop = inOutBounds.top;

        final int origTop = inOutBounds.top;

        switch (rotation) {

        switch (rotation) {
@@ -103,24 +103,36 @@ public class RotationUtils { 
                return;

                return;

            case ROTATION_90:

            case ROTATION_90:

                inOutBounds.left = inOutBounds.top;

                inOutBounds.left = inOutBounds.top;

                inOutBounds.top = parentBounds.right - inOutBounds.right;

                inOutBounds.top = parentWidth - inOutBounds.right;

                inOutBounds.right = inOutBounds.bottom;

                inOutBounds.right = inOutBounds.bottom;

                inOutBounds.bottom = parentBounds.right - origLeft;

                inOutBounds.bottom = parentWidth - origLeft;

                return;

                return;

            case ROTATION_180:

            case ROTATION_180:

                inOutBounds.left = parentBounds.right - inOutBounds.right;

                inOutBounds.left = parentWidth - inOutBounds.right;

                inOutBounds.right = parentBounds.right - origLeft;

                inOutBounds.right = parentWidth - origLeft;

                inOutBounds.top = parentBounds.bottom - inOutBounds.bottom;

                inOutBounds.top = parentHeight - inOutBounds.bottom;

                inOutBounds.bottom = parentBounds.bottom - origTop;

                inOutBounds.bottom = parentHeight - origTop;

                return;

                return;

            case ROTATION_270:

            case ROTATION_270:

                inOutBounds.left = parentBounds.bottom - inOutBounds.bottom;

                inOutBounds.left = parentHeight - inOutBounds.bottom;

                inOutBounds.bottom = inOutBounds.right;

                inOutBounds.bottom = inOutBounds.right;

                inOutBounds.right = parentBounds.bottom - inOutBounds.top;

                inOutBounds.right = parentHeight - inOutBounds.top;

                inOutBounds.top = origLeft;

                inOutBounds.top = origLeft;

        }

        }

    }

    }





    /**

     * Rotates bounds as if parentBounds and bounds are a group. The group is rotated by `delta`

     * 90-degree counter-clockwise increments. This assumes that parentBounds is at 0,0 and

     * remains at 0,0 after rotation. The bounds will be at the same physical position in

     * parentBounds.

     *

     * Only 'inOutBounds' is mutated.

     */

    public static void rotateBounds(Rect inOutBounds, Rect parentBounds, @Rotation int rotation) {

        rotateBounds(inOutBounds, parentBounds.right, parentBounds.bottom, rotation);

    }



    /** @return the rotation needed to rotate from oldRotation to newRotation. */

    /** @return the rotation needed to rotate from oldRotation to newRotation. */

    @Rotation

    @Rotation

    public static int deltaRotation(@Rotation int oldRotation, @Rotation int newRotation) {

    public static int deltaRotation(@Rotation int oldRotation, @Rotation int newRotation) {

packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java

+57 −21
Original line number Original line Diff line number Diff line
@@ -30,7 +30,9 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.content.IntentFilter;

import android.content.res.Configuration;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.content.res.Resources;

import android.graphics.Point;

import android.graphics.PointF;

import android.graphics.PointF;

import android.graphics.Rect;

import android.hardware.SensorPrivacyManager;

import android.hardware.SensorPrivacyManager;

import android.hardware.biometrics.BiometricAuthenticator.Modality;

import android.hardware.biometrics.BiometricAuthenticator.Modality;

import android.hardware.biometrics.BiometricConstants;

import android.hardware.biometrics.BiometricConstants;
@@ -54,6 +56,7 @@ import android.os.RemoteException; 
import android.os.UserManager;

import android.os.UserManager;

import android.util.Log;

import android.util.Log;

import android.util.SparseBooleanArray;

import android.util.SparseBooleanArray;

import android.view.DisplayInfo;

import android.view.MotionEvent;

import android.view.MotionEvent;

import android.view.WindowManager;

import android.view.WindowManager;
@@ -104,16 +107,16 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba 
    private final CommandQueue mCommandQueue;

    private final CommandQueue mCommandQueue;

    private final StatusBarStateController mStatusBarStateController;

    private final StatusBarStateController mStatusBarStateController;

    private final ActivityTaskManager mActivityTaskManager;

    private final ActivityTaskManager mActivityTaskManager;

    @Nullable

    @Nullable private final FingerprintManager mFingerprintManager;

    private final FingerprintManager mFingerprintManager;

    @Nullable private final FaceManager mFaceManager;

    @Nullable

    private final FaceManager mFaceManager;

    private final Provider<UdfpsController> mUdfpsControllerFactory;

    private final Provider<UdfpsController> mUdfpsControllerFactory;

    private final Provider<SidefpsController> mSidefpsControllerFactory;

    private final Provider<SidefpsController> mSidefpsControllerFactory;

    @Nullable



    private final PointF mFaceAuthSensorLocation;

    @NonNull private Point mStableDisplaySize = new Point();

    @Nullable



    private PointF mFingerprintLocation;

    @Nullable private final PointF mFaceAuthSensorLocation;

    @Nullable private PointF mFingerprintLocation;

    @Nullable private Rect mUdfpsBounds;

    private final Set<Callback> mCallbacks = new HashSet<>();

    private final Set<Callback> mCallbacks = new HashSet<>();





    // TODO: These should just be saved from onSaveState

    // TODO: These should just be saved from onSaveState
@@ -122,14 +125,13 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba 
    AuthDialog mCurrentDialog;

    AuthDialog mCurrentDialog;





    @NonNull private final WindowManager mWindowManager;

    @NonNull private final WindowManager mWindowManager;

    @NonNull private final DisplayManager mDisplayManager;

    @Nullable private UdfpsController mUdfpsController;

    @Nullable private UdfpsController mUdfpsController;

    @Nullable private IUdfpsHbmListener mUdfpsHbmListener;

    @Nullable private IUdfpsHbmListener mUdfpsHbmListener;

    @Nullable private SidefpsController mSidefpsController;

    @Nullable private SidefpsController mSidefpsController;

    @Nullable private IBiometricContextListener mBiometricContextListener;

    @Nullable private IBiometricContextListener mBiometricContextListener;

    @VisibleForTesting

    @VisibleForTesting IBiometricSysuiReceiver mReceiver;

    IBiometricSysuiReceiver mReceiver;

    @VisibleForTesting @NonNull final BiometricDisplayListener mOrientationListener;

    @VisibleForTesting

    @NonNull final BiometricDisplayListener mOrientationListener;

    @Nullable private final List<FaceSensorPropertiesInternal> mFaceProps;

    @Nullable private final List<FaceSensorPropertiesInternal> mFaceProps;

    @Nullable private List<FingerprintSensorPropertiesInternal> mFpProps;

    @Nullable private List<FingerprintSensorPropertiesInternal> mFpProps;

    @Nullable private List<FingerprintSensorPropertiesInternal> mUdfpsProps;

    @Nullable private List<FingerprintSensorPropertiesInternal> mUdfpsProps;
@@ -249,6 +251,7 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba 
        }

        }

        mAllFingerprintAuthenticatorsRegistered = true;

        mAllFingerprintAuthenticatorsRegistered = true;

        mFpProps = sensors;

        mFpProps = sensors;



        List<FingerprintSensorPropertiesInternal> udfpsProps = new ArrayList<>();

        List<FingerprintSensorPropertiesInternal> udfpsProps = new ArrayList<>();

        List<FingerprintSensorPropertiesInternal> sidefpsProps = new ArrayList<>();

        List<FingerprintSensorPropertiesInternal> sidefpsProps = new ArrayList<>();

        for (FingerprintSensorPropertiesInternal props : mFpProps) {

        for (FingerprintSensorPropertiesInternal props : mFpProps) {
@@ -259,12 +262,14 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba 
                sidefpsProps.add(props);

                sidefpsProps.add(props);

            }

            }

        }

        }



        mUdfpsProps = !udfpsProps.isEmpty() ? udfpsProps : null;

        mUdfpsProps = !udfpsProps.isEmpty() ? udfpsProps : null;

        if (mUdfpsProps != null) {

        if (mUdfpsProps != null) {

            mUdfpsController = mUdfpsControllerFactory.get();

            mUdfpsController = mUdfpsControllerFactory.get();

            mUdfpsController.addCallback(new UdfpsController.Callback() {

            mUdfpsController.addCallback(new UdfpsController.Callback() {

                @Override

                @Override

                public void onFingerUp() {}

                public void onFingerUp() {

                }





                @Override

                @Override

                public void onFingerDown() {

                public void onFingerDown() {
@@ -273,15 +278,22 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba 
                    }

                    }

                }

                }

            });

            });

            mUdfpsController.setAuthControllerUpdateUdfpsLocation(this::updateUdfpsLocation);

            mUdfpsBounds = mUdfpsProps.get(0).getLocation().getRect();

            updateUdfpsLocation();

        }

        }



        mSidefpsProps = !sidefpsProps.isEmpty() ? sidefpsProps : null;

        mSidefpsProps = !sidefpsProps.isEmpty() ? sidefpsProps : null;

        if (mSidefpsProps != null) {

        if (mSidefpsProps != null) {

            mSidefpsController = mSidefpsControllerFactory.get();

            mSidefpsController = mSidefpsControllerFactory.get();

        }

        }



        mFingerprintManager.registerBiometricStateListener(mBiometricStateListener);

        updateFingerprintLocation();



        for (Callback cb : mCallbacks) {

        for (Callback cb : mCallbacks) {

            cb.onAllAuthenticatorsRegistered();

            cb.onAllAuthenticatorsRegistered();

        }

        }

        mFingerprintManager.registerBiometricStateListener(mBiometricStateListener);

    }

    }





    private void handleEnrollmentsChanged(int userId, int sensorId, boolean hasEnrollments) {

    private void handleEnrollmentsChanged(int userId, int sensorId, boolean hasEnrollments) {
@@ -424,12 +436,11 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba 
    /**

    /**

     * @return where the UDFPS exists on the screen in pixels in portrait mode.

     * @return where the UDFPS exists on the screen in pixels in portrait mode.

     */

     */

    @Nullable public PointF getUdfpsSensorLocation() {

    @Nullable public PointF getUdfpsLocation() {

        if (mUdfpsController == null) {

        if (mUdfpsController == null || mUdfpsBounds == null) {

            return null;

            return null;

        }

        }

        return new PointF(mUdfpsController.getSensorLocation().centerX(),

        return new PointF(mUdfpsBounds.centerX(), mUdfpsBounds.centerY());

                mUdfpsController.getSensorLocation().centerY());

    }

    }





    /**

    /**
@@ -437,8 +448,8 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba 
     * overridden value will use the default value even if they don't have a fingerprint sensor

     * overridden value will use the default value even if they don't have a fingerprint sensor

     */

     */

    @Nullable public PointF getFingerprintSensorLocation() {

    @Nullable public PointF getFingerprintSensorLocation() {

        if (getUdfpsSensorLocation() != null) {

        if (getUdfpsLocation() != null) {

            return getUdfpsSensorLocation();

            return getUdfpsLocation();

        }

        }

        return mFingerprintLocation;

        return mFingerprintLocation;

    }

    }
@@ -525,12 +536,13 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba 
        mFaceManager = faceManager;

        mFaceManager = faceManager;

        mUdfpsControllerFactory = udfpsControllerFactory;

        mUdfpsControllerFactory = udfpsControllerFactory;

        mSidefpsControllerFactory = sidefpsControllerFactory;

        mSidefpsControllerFactory = sidefpsControllerFactory;

        mDisplayManager = displayManager;

        mWindowManager = windowManager;

        mWindowManager = windowManager;

        mUdfpsEnrolledForUser = new SparseBooleanArray();

        mUdfpsEnrolledForUser = new SparseBooleanArray();





        mOrientationListener = new BiometricDisplayListener(

        mOrientationListener = new BiometricDisplayListener(

                context,

                context,

                displayManager,

                mDisplayManager,

                mHandler,

                mHandler,

                BiometricDisplayListener.SensorType.Generic.INSTANCE,

                BiometricDisplayListener.SensorType.Generic.INSTANCE,

                () -> {

                () -> {
@@ -582,6 +594,27 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba 
                yLocation);

                yLocation);

    }

    }





    // TODO(b/229290039): UDFPS controller should manage its dimensions on its own. Remove this.

    // This is not combined with updateFingerprintLocation because this is invoked directly from

    // UdfpsController, only when it cares about a rotation change. The implications of calling

    // updateFingerprintLocation in such a case are unclear.

    private void updateUdfpsLocation() {

        if (mUdfpsController != null) {

            final DisplayInfo displayInfo = new DisplayInfo();

            mContext.getDisplay().getDisplayInfo(displayInfo);

            final float scaleFactor = android.util.DisplayUtils.getPhysicalPixelDisplaySizeRatio(

                    mStableDisplaySize.x, mStableDisplaySize.y, displayInfo.getNaturalWidth(),

                    displayInfo.getNaturalHeight());



            final FingerprintSensorPropertiesInternal udfpsProp = mUdfpsProps.get(0);

            mUdfpsBounds = udfpsProp.getLocation().getRect();

            mUdfpsBounds.scale(scaleFactor);

            mUdfpsController.updateOverlayParams(udfpsProp.sensorId,

                    new UdfpsOverlayParams(mUdfpsBounds, displayInfo.getNaturalWidth(),

                            displayInfo.getNaturalHeight(), scaleFactor, displayInfo.rotation));

        }

    }



    @SuppressWarnings("deprecation")

    @SuppressWarnings("deprecation")

    @Override

    @Override

    public void start() {

    public void start() {
@@ -592,6 +625,7 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba 
                    mFingerprintAuthenticatorsRegisteredCallback);

                    mFingerprintAuthenticatorsRegisteredCallback);

        }

        }





        mStableDisplaySize = mDisplayManager.getStableDisplaySize();

        mActivityTaskManager.registerTaskStackListener(mTaskStackListener);

        mActivityTaskManager.registerTaskStackListener(mTaskStackListener);

    }

    }
@@ -906,6 +940,7 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba 
    protected void onConfigurationChanged(Configuration newConfig) {

    protected void onConfigurationChanged(Configuration newConfig) {

        super.onConfigurationChanged(newConfig);

        super.onConfigurationChanged(newConfig);

        updateFingerprintLocation();

        updateFingerprintLocation();

        updateUdfpsLocation();





        // Save the state of the current dialog (buttons showing, etc)

        // Save the state of the current dialog (buttons showing, etc)

        if (mCurrentDialog != null) {

        if (mCurrentDialog != null) {
@@ -935,6 +970,7 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba 




    private void onOrientationChanged() {

    private void onOrientationChanged() {

        updateFingerprintLocation();

        updateFingerprintLocation();

        updateUdfpsLocation();

        if (mCurrentDialog != null) {

        if (mCurrentDialog != null) {

            mCurrentDialog.onOrientationChanged();

            mCurrentDialog.onOrientationChanged();

        }

        }

packages/SystemUI/src/com/android/systemui/biometrics/BiometricDisplayListener.kt

+6 −4
Original line number Original line Diff line number Diff line
@@ -64,7 +64,11 @@ class BiometricDisplayListener( 
    /** Listen for changes. */

    /** Listen for changes. */

    fun enable() {

    fun enable() {

        lastRotation = context.display?.rotation ?: Surface.ROTATION_0

        lastRotation = context.display?.rotation ?: Surface.ROTATION_0

        displayManager.registerDisplayListener(this, handler)

        displayManager.registerDisplayListener(

            this,

            handler,

            DisplayManager.EVENT_FLAG_DISPLAY_CHANGED

        )

    }

    }





    /** Stop listening for changes. */

    /** Stop listening for changes. */
@@ -80,9 +84,7 @@ class BiometricDisplayListener( 
     */

     */

    sealed class SensorType {

    sealed class SensorType {

        object Generic : SensorType()

        object Generic : SensorType()

        data class UnderDisplayFingerprint(

        object UnderDisplayFingerprint : SensorType()

            val properties: FingerprintSensorPropertiesInternal

        ) : SensorType()

        data class SideFingerprint(

        data class SideFingerprint(

            val properties: FingerprintSensorPropertiesInternal

            val properties: FingerprintSensorPropertiesInternal

        ) : SensorType()

        ) : SensorType()

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java

+76 −93

File changed.

Preview size limit exceeded, changes collapsed.