commit 4dfa4cca7a4fcf5ea4a37dca1fef7f2f56f6dd8c
author Yin-Chia Yeh <yinchiayeh@google.com> Fri Nov 10 20:00:09 2017 -0800
committer Yin-Chia Yeh <yinchiayeh@google.com> Tue Dec 19 11:05:20 2017 -0800
tree f92865e72d54b28eabe206f027c632cb08ce6abb
parent d39b9e3ec153f68b6ba81228b5aa29a9b72770b0

Camera: pass StreamSurfaceId instead of Surface

Also fix buffer error callback on shared surfaces.

Test: CTS
Bug: 68020997
Change-Id: I71d6a1373ff09dcb21d39f78dd56727cbde9a3ad

camera/ndk/impl/ACameraDevice.h

diff --git a/camera/ndk/impl/ACameraDevice.h b/camera/ndk/impl/ACameraDevice.h
index 23cc1a1..7d45e80 100644
--- a/camera/ndk/impl/ACameraDevice.h
+++ b/camera/ndk/impl/ACameraDevice.h
@@ -123,9 +123,9 @@
             /*out*/int* captureSequenceId,
             bool isRepeating);
 
-    camera_status_t updateOutputConfiguration(ACaptureSessionOutput *output);
+    camera_status_t updateOutputConfigurationLocked(ACaptureSessionOutput *output);
 
-    static camera_status_t allocateCaptureRequest(
+    camera_status_t allocateCaptureRequest(
             const ACaptureRequest* request, sp<CaptureRequest>& outReq);
 
     static ACaptureRequest* allocateACaptureRequest(sp<CaptureRequest>& req);