commit 0f2cb99f985c8e38dc7b596b7f72bf6e643f77b7
author Jayant Chowdhary <jchowdhary@google.com> Fri Feb 17 18:25:53 2023 +0000
committer Jayant Chowdhary <jchowdhary@google.com> Thu Feb 23 21:38:25 2023 +0000
tree 3a13fbf2aa83776d825840f9cdd83bb4b3454e32
parent 20492274762c7359cf4b7ffe54d3fa8c67a00ab6

Fix condition check for onWindowPrepared callbacks test.

Fix a couple of other nits.

Bug: 259735869

Test: ACameraNdkVendorTest

Change-Id: I2ecf9ae0726a8b58f0c6329fc79b26a87fcbd190
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>

camera/ndk/NdkCameraCaptureSession.cpp

diff --git a/camera/ndk/NdkCameraCaptureSession.cpp b/camera/ndk/NdkCameraCaptureSession.cpp
index 8a3acf3..e6c876b 100644
--- a/camera/ndk/NdkCameraCaptureSession.cpp
+++ b/camera/ndk/NdkCameraCaptureSession.cpp
@@ -40,7 +40,6 @@
     if (session != nullptr) {
         session->closeByApp();
     }
-
     return;
 }
 
@@ -192,6 +191,7 @@
     }
     return session->updateOutputConfiguration(output);
 }
+
 EXPORT
 camera_status_t ACameraCaptureSession_setWindowPreparedCallback(
         ACameraCaptureSession* session, ACameraCaptureSession_prepareCallbacks *cb) {
@@ -230,4 +230,4 @@
         return ACAMERA_ERROR_SESSION_CLOSED;
     }
     return session->prepare(window);
-}
\ No newline at end of file
+}

camera/ndk/impl/ACameraDevice.cpp

diff --git a/camera/ndk/impl/ACameraDevice.cpp b/camera/ndk/impl/ACameraDevice.cpp
index b90f276..1dae0f9 100644
--- a/camera/ndk/impl/ACameraDevice.cpp
+++ b/camera/ndk/impl/ACameraDevice.cpp
@@ -1093,7 +1093,7 @@
                     ACameraCaptureSession_prepareCallback onWindowPrepared;
                     found = msg->findPointer(kCallbackFpKey, (void**) &onWindowPrepared);
                     if (!found) {
-                        ALOGE("%s: Cannot find state callback!", __FUNCTION__);
+                        ALOGE("%s: Cannot find window prepared callback!", __FUNCTION__);
                         return;
                     }
                     if (onWindowPrepared == nullptr) {

camera/ndk/ndk_vendor/tests/AImageReaderVendorTest.cpp

diff --git a/camera/ndk/ndk_vendor/tests/AImageReaderVendorTest.cpp b/camera/ndk/ndk_vendor/tests/AImageReaderVendorTest.cpp
index e62f7c3..00d66aa 100644
--- a/camera/ndk/ndk_vendor/tests/AImageReaderVendorTest.cpp
+++ b/camera/ndk/ndk_vendor/tests/AImageReaderVendorTest.cpp
@@ -330,7 +330,7 @@
     }
     void incPendingPrepared(ACameraWindowType *anw) {
         std::lock_guard<std::mutex> lock(mMutex);
-        if (!(mPendingPreparedCbs.find(anw) == mPendingPreparedCbs.end())) {
+        if ((mPendingPreparedCbs.find(anw) == mPendingPreparedCbs.end())) {
             mPendingPreparedCbs[anw] = 1;
             return;
         }