From d21c46b3cc97497be689c344046b51cba00aa4b5 Mon Sep 17 00:00:00 2001
From: Yin-Chia Yeh <yinchiayeh@google.com>
Date: Tue, 10 Oct 2017 11:59:46 -0700
Subject: [PATCH] Camera: fix use after freed error

Test: static analyzer warning is fixed
Bug: 67606758
Change-Id: I563b581755dc874d1c19f6875b161f7b8912229d
---
 camera/ndk/impl/ACameraDevice.cpp | 1 -
 camera/ndk/impl/ACameraDevice.h   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/camera/ndk/impl/ACameraDevice.cpp b/camera/ndk/impl/ACameraDevice.cpp
index 229b159bab..79a3e3a474 100644
--- a/camera/ndk/impl/ACameraDevice.cpp
+++ b/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:
diff --git a/camera/ndk/impl/ACameraDevice.h b/camera/ndk/impl/ACameraDevice.h
index c566cd295c..c0766c53d7 100644
--- a/camera/ndk/impl/ACameraDevice.h
+++ b/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 {