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

Commit 9b0cae93 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am f0c9d6f1: am d1e3456b: am 215763fb: am cd065639: am e6fd76c2: Merge "Don\'t... 

am f0c9d6f1: am d1e3456b: am 215763fb: am cd065639: am e6fd76c2: Merge "Don\'t use fingerId when creating names" into mnc-dev

* commit 'f0c9d6f1':
  Don't use fingerId when creating names
parents 8227317a f0c9d6f1

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -56,7 +56,7 @@ public class FingerprintUtils { 
    }

    }





    public void addFingerprintForUser(Context ctx, int fingerId, int userId) {

    public void addFingerprintForUser(Context ctx, int fingerId, int userId) {

        getStateForUser(ctx, userId).addFingerprint(fingerId);

        getStateForUser(ctx, userId).addFingerprint(fingerId, userId);

    }

    }





    public void removeFingerprintIdForUser(Context ctx, int fingerId, int userId) {

    public void removeFingerprintIdForUser(Context ctx, int fingerId, int userId) {

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

+26 −4
Original line number Original line Diff line number Diff line
@@ -68,9 +68,9 @@ class FingerprintsUserState { 
        }

        }

    }

    }





    public void addFingerprint(int fingerId) {

    public void addFingerprint(int fingerId, int groupId) {

        synchronized (this) {

        synchronized (this) {

            mFingerprints.add(new Fingerprint(getDefaultFingerprintName(fingerId), 0, fingerId, 0));

            mFingerprints.add(new Fingerprint(getUniqueName(), groupId, fingerId, 0));

            scheduleWriteStateLocked();

            scheduleWriteStateLocked();

        }

        }

    }

    }
@@ -107,8 +107,30 @@ class FingerprintsUserState { 
        }

        }

    }

    }





    private String getDefaultFingerprintName(int fingerId) {

    /**

        return mCtx.getString(com.android.internal.R.string.fingerprint_name_template, fingerId);

     * Finds a unique name for the given fingerprint

     * @return unique name

     */

    private String getUniqueName() {

        int guess = 1;

        while (true) {

            // Not the most efficient algorithm in the world, but there shouldn't be more than 10

            String name = mCtx.getString(com.android.internal.R.string.fingerprint_name_template,

                    guess);

            if (isUnique(name)) {

                return name;

            }

            guess++;

        }

    }



    private boolean isUnique(String name) {

        for (Fingerprint fp : mFingerprints) {

            if (fp.getName().equals(name)) {

                return false;

            }

        }

        return true;

    }

    }





    private static File getFileForUser(int userId) {

    private static File getFileForUser(int userId) {