commit fbaedd7ccb090b687747f054b3157f8a5e43ad51
author Eino-Ville Talvala <etalvala@google.com> Mon Aug 17 13:41:08 2020 -0700
committer Eino-Ville Talvala <etalvala@google.com> Mon Aug 17 13:41:08 2020 -0700
tree 20a96276c265b165681d81f7401084d9843972a2
parent e52b8fa8fabd74555dd1ebb2e9405460a545a919

Camera: Allow 0-face notifications to be sent

Applications need to know when all faces have left a scene, so
filtering out zero-faces messages is incorrect.

Test: atest CameraTest on sargo-userdebug
Bug: 162302014
Change-Id: I269fccd3ac04c1aa650bfea95da16e8c4871b7e5

camera/ICameraClient.cpp

diff --git a/camera/ICameraClient.cpp b/camera/ICameraClient.cpp
index c02c81b..bef2ea0 100644
--- a/camera/ICameraClient.cpp
+++ b/camera/ICameraClient.cpp
@@ -142,7 +142,8 @@
             camera_frame_metadata_t metadata;
             if (data.dataAvail() > 0) {
                 metadata.number_of_faces = data.readInt32();
-                if (metadata.number_of_faces <= 0 ||
+                // Zero faces is a valid case, to notify clients that no faces are now visible
+                if (metadata.number_of_faces < 0 ||
                         metadata.number_of_faces > (int32_t)(INT32_MAX / sizeof(camera_face_t))) {
                     ALOGE("%s: Too large face count: %d", __FUNCTION__, metadata.number_of_faces);
                     return BAD_VALUE;