commit 9918adaee7fa081c09b4ef9ea55626b2ba56b97b
author Erfan Abdi <erfangplus@gmail.com> Mon Apr 17 15:53:28 2023 +0330
committer Erfan Abdi <erfangplus@gmail.com> Mon Apr 17 18:27:10 2023 +0330
tree dfdb1252504e929ea520802f3bc72e896108a478
parent d3610e81de9b0055082537499a91b6e5a31c28e6

FaceUnlockServer: Use kFaceId for onRemoved

* And some fixes for remove

Change-Id: I2cc1cfa1d2174074f381de85a8e3813bfc88ae66

framework/server/com/libremobileos/faceunlock/server/FaceUnlockServer.java

diff --git a/framework/server/com/libremobileos/faceunlock/server/FaceUnlockServer.java b/framework/server/com/libremobileos/faceunlock/server/FaceUnlockServer.java
index dc57602..6aa190e 100644
--- a/framework/server/com/libremobileos/faceunlock/server/FaceUnlockServer.java
+++ b/framework/server/com/libremobileos/faceunlock/server/FaceUnlockServer.java
@@ -240,13 +240,14 @@
 
 			mWorkHandler.post(() -> {
 				RemoteFaceServiceClient.connect(mStorePath, faced -> {
+					int[] faceIds = new int[1];
 					if ((faceId == kFaceId || faceId == 0) && faced.isEnrolled()) {
 						faced.unenroll();
-						int[] faceIds = new int[1];
-						faceIds[0] = faceId;
+						faceIds[0] = kFaceId;
+					}
+					if (mCallback != null) {
 						try {
-							if (mCallback != null)
-								mCallback.onRemoved(kDeviceId, faceIds, mUserId);
+							mCallback.onRemoved(kDeviceId, faceIds, mUserId);
 						} catch (RemoteException e) {
 							e.printStackTrace();
 						}