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

Commit 062dacbd authored by Andy Mast's avatar Andy Mast
Browse files

CYNGNOS-489: Fingerprint: Fix concurrent mod exception when getting Fingerprint list 

Use iterator remove instead of list remove when iterating through a list.

Fingerprint data is stored in native and in global settings, so it has to be
merged when a client wants to get the list of fingerprints. If the native data
is missing, the settings data removes the fingerprint so that the two data stores are synced.

Change-Id: I81c7121dbe1b5227779c40de9b5f92a18efd1c1e
parent 4f26eacc

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

+1 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ public class FingerprintService extends SystemService { 
            Fingerprint nativeFinger = nativeFingerMap.get(settingsFinger.getFingerId());

            if (nativeFinger == null) {

                // Finger exists in Settings but not in native space. Remove it from settings

                settingsFingerprints.remove(settingsFinger);

                iter.remove();

                modifiedSettingsFingers = true;

            } else {

                // Finger exists in Settings and in native space, merge it