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

Commit 790a3cfd authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Revert "Do not show side fingerprint sensor overlay when used from... 

Merge "Revert "Do not show side fingerprint sensor overlay when used from settings."" into sc-v2-dev am: 7f1538b2

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

Change-Id: Iefd5b3ac9e50a3e60ae173163db1841743a1d06c
parents d792f5f5 7f1538b2

core/java/android/hardware/biometrics/BiometricOverlayConstants.java

+1 −4
Original line number Original line Diff line number Diff line
@@ -38,16 +38,13 @@ public interface BiometricOverlayConstants { 
    int REASON_AUTH_KEYGUARD = 4;

    int REASON_AUTH_KEYGUARD = 4;

    /** Non-specific usage (from FingerprintManager). */

    /** Non-specific usage (from FingerprintManager). */

    int REASON_AUTH_OTHER = 5;

    int REASON_AUTH_OTHER = 5;

    /** Usage from Settings. */

    int REASON_AUTH_SETTINGS = 6;





    @IntDef({REASON_UNKNOWN,

    @IntDef({REASON_UNKNOWN,

            REASON_ENROLL_FIND_SENSOR,

            REASON_ENROLL_FIND_SENSOR,

            REASON_ENROLL_ENROLLING,

            REASON_ENROLL_ENROLLING,

            REASON_AUTH_BP,

            REASON_AUTH_BP,

            REASON_AUTH_KEYGUARD,

            REASON_AUTH_KEYGUARD,

            REASON_AUTH_OTHER,

            REASON_AUTH_OTHER})

            REASON_AUTH_SETTINGS})

    @Retention(RetentionPolicy.SOURCE)

    @Retention(RetentionPolicy.SOURCE)

    @interface ShowReason {}

    @interface ShowReason {}

}
 
}

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ import android.graphics.PorterDuffColorFilter 
import android.graphics.Rect

import android.graphics.Rect

import android.hardware.biometrics.BiometricOverlayConstants

import android.hardware.biometrics.BiometricOverlayConstants

import android.hardware.biometrics.BiometricOverlayConstants.REASON_AUTH_KEYGUARD

import android.hardware.biometrics.BiometricOverlayConstants.REASON_AUTH_KEYGUARD

import android.hardware.biometrics.BiometricOverlayConstants.REASON_AUTH_SETTINGS

import android.hardware.display.DisplayManager

import android.hardware.display.DisplayManager

import android.hardware.fingerprint.FingerprintManager

import android.hardware.fingerprint.FingerprintManager

import android.hardware.fingerprint.FingerprintSensorPropertiesInternal

import android.hardware.fingerprint.FingerprintSensorPropertiesInternal
@@ -182,7 +181,6 @@ class SidefpsController @Inject constructor( 
@BiometricOverlayConstants.ShowReason

@BiometricOverlayConstants.ShowReason

private fun Int.isReasonToShow(): Boolean = when (this) {

private fun Int.isReasonToShow(): Boolean = when (this) {

    REASON_AUTH_KEYGUARD -> false

    REASON_AUTH_KEYGUARD -> false

    REASON_AUTH_SETTINGS -> false

    else -> true

    else -> true

}

}

packages/SystemUI/tests/src/com/android/systemui/biometrics/SidefpsControllerTest.kt

+1 −11
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.biometrics 




import android.graphics.Rect

import android.graphics.Rect

import android.hardware.biometrics.BiometricOverlayConstants.REASON_AUTH_KEYGUARD

import android.hardware.biometrics.BiometricOverlayConstants.REASON_AUTH_KEYGUARD

import android.hardware.biometrics.BiometricOverlayConstants.REASON_AUTH_SETTINGS

import android.hardware.biometrics.BiometricOverlayConstants.REASON_UNKNOWN

import android.hardware.biometrics.BiometricOverlayConstants.REASON_UNKNOWN

import android.hardware.biometrics.SensorProperties

import android.hardware.biometrics.SensorProperties

import android.hardware.display.DisplayManager

import android.hardware.display.DisplayManager
@@ -183,16 +182,7 @@ class SidefpsControllerTest : SysuiTestCase() { 




    @Test

    @Test

    fun testIgnoredForKeyguard() {

    fun testIgnoredForKeyguard() {

        testIgnoredFor(REASON_AUTH_KEYGUARD)

        overlayController.show(SENSOR_ID, REASON_AUTH_KEYGUARD)

    }



    @Test

    fun testIgnoredForSettings() {

        testIgnoredFor(REASON_AUTH_SETTINGS)

    }



    private fun testIgnoredFor(reason: Int) {

        overlayController.show(SENSOR_ID, reason)

        executor.runAllReady()

        executor.runAllReady()





        verify(windowManager, never()).addView(any(), any())

        verify(windowManager, never()).addView(any(), any())

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

+0 −6
Original line number Original line Diff line number Diff line
@@ -168,10 +168,6 @@ public abstract class AuthenticationClient<T> extends AcquisitionClient<T> 
        return Utils.isKeyguard(getContext(), getOwnerString());

        return Utils.isKeyguard(getContext(), getOwnerString());

    }

    }





    private boolean isSettings() {

        return Utils.isSettings(getContext(), getOwnerString());

    }



    @Override

    @Override

    protected boolean isCryptoOperation() {

    protected boolean isCryptoOperation() {

        return mOperationId != 0;

        return mOperationId != 0;
@@ -503,8 +499,6 @@ public abstract class AuthenticationClient<T> extends AcquisitionClient<T> 
    protected int getShowOverlayReason() {

    protected int getShowOverlayReason() {

        if (isKeyguard()) {

        if (isKeyguard()) {

            return BiometricOverlayConstants.REASON_AUTH_KEYGUARD;

            return BiometricOverlayConstants.REASON_AUTH_KEYGUARD;

        } else if (isSettings()) {

            return BiometricOverlayConstants.REASON_AUTH_SETTINGS;

        } else if (isBiometricPrompt()) {

        } else if (isBiometricPrompt()) {

            return BiometricOverlayConstants.REASON_AUTH_BP;

            return BiometricOverlayConstants.REASON_AUTH_BP;

        } else {

        } else {