commit ed876385f2256aaec717cef4a9072028c26621a8
author Emilian Peev <epeev@google.com> Mon Sep 19 15:55:52 2022 -0700
committer Emilian Peev <epeev@google.com> Mon Sep 19 23:12:27 2022 +0000
tree 0a8f19da3740e0236c6fe39ff0b622362a2fc62a
parent 16575d719e6987f8a29639ffb094e424adc30bd9

camera2 vndk: Improve error handling

Check for binder status when removing the camera
service listener.
Additionally check for any invalid extended availability
callbacks.

Bug: 247615866
Test: adb shell
/data/nativetest64/vendor/ACameraNdkVendorTest/ACameraNdkVendorTest

Change-Id: Ia043934288d8c5e5584034a08de24c998468039d

camera/ndk/ndk_vendor/impl/ACameraManager.cpp

diff --git a/camera/ndk/ndk_vendor/impl/ACameraManager.cpp b/camera/ndk/ndk_vendor/impl/ACameraManager.cpp
index 77c934a..bb4ef56 100644
--- a/camera/ndk/ndk_vendor/impl/ACameraManager.cpp
+++ b/camera/ndk/ndk_vendor/impl/ACameraManager.cpp
@@ -165,7 +165,10 @@
     Mutex::Autolock _l(mLock);
     if (mCameraService != nullptr) {
         mCameraService->unlinkToDeath(mDeathNotifier);
-        mCameraService->removeListener(mCameraServiceListener);
+        auto stat = mCameraService->removeListener(mCameraServiceListener);
+        if (!stat.isOk()) {
+            ALOGE("Failed to remove listener to camera service %s", stat.description().c_str());
+        }
     }
     mDeathNotifier.clear();
     if (mCbLooper != nullptr) {
@@ -475,6 +478,10 @@
                 ALOGE("%s: Cannot find camera callback fp!", __FUNCTION__);
                 return;
             }
+            if (cb == nullptr) {
+                // Physical camera callback is null
+                return;
+            }
             found = msg->findPointer(kContextKey, &context);
             if (!found) {
                 ALOGE("%s: Cannot find callback context!", __FUNCTION__);