Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the race condition between fingerprint ennrollment sync command and the internal cleanup operations" into udc-dev

Browse Source
This commit is contained in:
Jeff Pu
2023-03-29 15:51:49 +00:00
committed by Android (Google) Code Review
parent e12deb3a12 3d280bf5f8
commit f5c29da4c7
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java
View File

@@ -82,7 +82,9 @@ import com.android.internal.widget.LockPatternUtils;
import com.android.server.SystemService; import com.android.server.SystemService;
import com.android.server.biometrics.Utils; import com.android.server.biometrics.Utils;
import com.android.server.biometrics.log.BiometricContext; import com.android.server.biometrics.log.BiometricContext;
import com.android.server.biometrics.sensors.BaseClientMonitor;
import com.android.server.biometrics.sensors.BiometricStateCallback; import com.android.server.biometrics.sensors.BiometricStateCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter; import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
import com.android.server.biometrics.sensors.LockoutResetDispatcher; import com.android.server.biometrics.sensors.LockoutResetDispatcher;
import com.android.server.biometrics.sensors.LockoutTracker; import com.android.server.biometrics.sensors.LockoutTracker;
@@ -97,7 +99,9 @@ import java.io.PrintWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
@@ -1138,11 +1142,27 @@ public class FingerprintService extends SystemService {
if (Utils.isVirtualEnabled(getContext())) { if (Utils.isVirtualEnabled(getContext())) {
Slog.i(TAG, "Sync virtual enrollments"); Slog.i(TAG, "Sync virtual enrollments");
final int userId = ActivityManager.getCurrentUser(); final int userId = ActivityManager.getCurrentUser();
final CountDownLatch latch = new CountDownLatch(mRegistry.getProviders().size());
for (ServiceProvider provider : mRegistry.getProviders()) { for (ServiceProvider provider : mRegistry.getProviders()) {
for (FingerprintSensorPropertiesInternal props : provider.getSensorProperties()) { for (FingerprintSensorPropertiesInternal props : provider.getSensorProperties()) {
provider.scheduleInternalCleanup(props.sensorId, userId, null /* callback */, provider.scheduleInternalCleanup(props.sensorId, userId,
true /* favorHalEnrollments */); new ClientMonitorCallback() {
} @Override
public void onClientFinished(
@NonNull BaseClientMonitor clientMonitor,
boolean success) {
latch.countDown();
if (!success) {
Slog.e(TAG, "Sync virtual enrollments failed");
}
}
}, true /* favorHalEnrollments */);
}
}
try {
latch.await(3, TimeUnit.SECONDS);
} catch (Exception e) {
Slog.e(TAG, "Failed to wait for sync finishing", e);
} }
} }
} }