Camera: Fix deadlock in ACameraCaptureSession destructor
mSequenceCallbackMap's entry should be cleared before calling
onSequenceCompletedCallback. This is to make sure the
ACameraCaptureSession object is destroyed in the callback thread.
The fix is for a regression introduced in ag/11835321.
Test: Camera CTS
Bug: 176034707
Change-Id: Ib38f4ca8ec499cd88f31b0be09f1db74e5ec35c6
diff --git a/camera/ndk/impl/ACameraDevice.h b/camera/ndk/impl/ACameraDevice.h
index d937865..3073dfb 100644
--- a/camera/ndk/impl/ACameraDevice.h
+++ b/camera/ndk/impl/ACameraDevice.h
@@ -354,6 +354,7 @@
void checkRepeatingSequenceCompleteLocked(const int sequenceId, const int64_t lastFrameNumber);
void checkAndFireSequenceCompleteLocked();
void removeCompletedCallbackHolderLocked(int64_t lastCompletedRegularFrameNumber);
+ void sendCaptureSequenceCompletedLocked(int sequenceId, int64_t lastFrameNumber);
// Misc variables
int32_t mShadingMapSize[2]; // const after constructor