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

Commit 8927ac14 authored by Jim Miller's avatar Jim Miller Committed by android-build-merger
Browse files

Merge \\\"Relax security constraint around getAuthenticatorId().\\\" into... 

Merge \\\"Relax security constraint around getAuthenticatorId().\\\" into nyc-dev am: 60c04126 am: 3ff70b63
am: 82100f8e

Change-Id: I5b47b820eca120ae4a1f9a2cf5440b46237c29c6
parents 21b6b821 82100f8e

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

+5 −7
Original line number Diff line number Diff line
@@ -1019,14 +1019,12 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe 
        }

    }



    /***

     * @param opPackageName the name of the calling package

     * @return authenticator id for the current user

     */

    public long getAuthenticatorId(String opPackageName) {

        if (canUseFingerprint(opPackageName, false /* foregroundOnly */,

                Binder.getCallingUid(), Binder.getCallingPid())) {

        return mCurrentAuthenticatorId;

        } else {

            Slog.w(TAG, "Client isn't current, returning authenticator_id=0");

        }

        return 0;

    }



}