diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index 23382e84..abf97344 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -1334,6 +1334,14 @@ void CPhoneDevice::handleTimerImpl(CPhoneDevice::TIMER_CONTEXT* context) void CPhoneDevice::handleRebootTimer(union sigval v) { +#ifdef OUTPUT_DBG_INFO + const char *path = "/sdcard/com.xypower.mpapp/tmp/closeThreadReboot.txt"; + FILE* file = fopen(path, "w"); + if (file) { + fprintf(file, "Restarting app due to: Camera Can't Close\n"); + fclose(file); + } +#endif CPhoneDevice* pDevice = (CPhoneDevice*)(v.sival_ptr); // Reboot APP XYLOG(XYLOG_SEVERITY_ERROR, "Camera Close Thread is DEAD, will RESTART app"); diff --git a/app/src/main/cpp/camera2/ndkcamera.cpp b/app/src/main/cpp/camera2/ndkcamera.cpp index d57254db..b52afcc0 100644 --- a/app/src/main/cpp/camera2/ndkcamera.cpp +++ b/app/src/main/cpp/camera2/ndkcamera.cpp @@ -1078,10 +1078,10 @@ void NdkCamera::close() image = NULL; } AImageReader_setImageListener(mImageReader, NULL); - XYLOG(XYLOG_SEVERITY_DEBUG, "clear mImageReader Listener"); + //XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::AImageReader_delete %s", mCameraId.c_str()); AImageReader_delete(mImageReader); - XYLOG(XYLOG_SEVERITY_DEBUG, "delete mImageReader"); + //XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::End AImageReader_delete %s", mCameraId.c_str()); mImageReader = 0; } @@ -1333,7 +1333,6 @@ void NdkCamera::onImageAvailable(AImageReader* reader) m_photoTaken = true; m_locker.lock(); - XYLOG(XYLOG_SEVERITY_DEBUG,"push image"); mCaptureFrames.push_back(std::shared_ptr(image, Auto_AImage_delete)); m_locker.unlock();