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

Commit bdf823ed authored by Carlo Savignano's avatar Carlo Savignano Committed by dianlujitao
Browse files

fingerprint: notify client when cancelling succeeded 



* Some fingerprint hardware hals might not notify userspace in time
  in some scenarios when successful authentication cancel is performed.
* This is observed for example in some devices that have power and/or home
  buttons merged with fingerprint sensor, but not limited to such cases.
* Add a opt-in configuration to enable client authentication cancel from
  fingerprint service when successful.
* This addresses originally an issue where requesting fingerprint to be
  disabled and then enabled will wait till cancelling timeout before changing
  fingerprint sensor state and start authenticating again.

Change-Id: I6a6795fbb795f0c6a4ff8ad27ac807e2f744c2d9
Signed-off-by: default avatarCarlo Savignano <carlosavignano@aospa.co>
parent dbfbf86d

core/res/res/values/cm_symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -105,4 +105,7 @@ 
    <java-symbol type="string" name="tethered_notification_no_device_message" />

    <java-symbol type="string" name="tethered_notification_one_device_message" />

    <java-symbol type="string" name="tethered_notification_multi_device_message" />



    <!-- Whether notify fingerprint client of successful cancelled authentication -->

    <java-symbol type="bool" name="config_notifyClientOnFingerprintCancelSuccess" />

</resources>

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -2944,4 +2944,7 @@ 
    <bool name="config_useWakeLockForFlashlight">false</bool>



    <bool name="single_hand_mode">true</bool>



    <!-- Whether notify fingerprint client of successful cancelled authentication -->

    <bool name="config_notifyClientOnFingerprintCancelSuccess">false</bool>

</resources>

services/core/java/com/android/server/fingerprint/FingerprintService.java

+6 −1
Original line number Diff line number Diff line
@@ -853,7 +853,12 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe 
                        if (client instanceof AuthenticationClient) {

                            if (client.getToken() == token) {

                                if (DEBUG) Slog.v(TAG, "stop client " + client.getOwnerString());

                                client.stop(client.getToken() == token);

                                final boolean notifyClient = mContext.getResources().getBoolean(

                                        com.android.internal.R.bool.config_notifyClientOnFingerprintCancelSuccess);

                                final int stopResult = client.stop(client.getToken() == token);

                                if (notifyClient && (stopResult == 0)) {

                                    handleError(mHalDeviceId, FingerprintManager.FINGERPRINT_ERROR_CANCELED);

                                }

                            } else {

                                if (DEBUG) Slog.v(TAG, "can't stop client "

                                        + client.getOwnerString() + " since tokens don't match");