Merge "Camera: fix use after freed error" am: b7939bbfbf

am: d0cc49f98d

Change-Id: Ib0039015a209112cad8dafbfef546674c20ed9fb

camera/ndk/impl/ACameraDevice.cpp

@@ -941,7 +941,6 @@ void CameraDevice::CallbackHandler::onMessageReceived(
                     ACaptureRequest* request = allocateACaptureRequest(requestSp);
                     (*onFail)(context, session.get(), request, failure);
                     freeACaptureRequest(request);
-                    delete failure;
                     break;
                 }
                 case kWhatCaptureSeqEnd:

camera/ndk/impl/ACameraDevice.h

@@ -41,7 +41,7 @@
 
 namespace android {
 
-// Wrap ACameraCaptureFailure so it can be ref-counter
+// Wrap ACameraCaptureFailure so it can be ref-counted
 struct CameraCaptureFailure : public RefBase, public ACameraCaptureFailure {};
 
 class CameraDevice final : public RefBase {