commit 98e24724fb77445d4d015a5fec4ecbd5b49abc9b
author Igor Murashkin <iam@google.com> Wed Jun 19 19:51:04 2013 -0700
committer Igor Murashkin <iam@google.com> Thu Jun 20 20:31:36 2013 -0700
tree 0cb728e66991da37489bac60fd1ac9870c4d095d
parent e7ee7637747371635a85fedd24d2190bb1f38651

Make android.hardware.photography.Camera work on HAL3+ devices

Bug: 9213377
Change-Id: I5b2eeab28985f53dfcb7b8e3029930f5adcd74f5

services/camera/libcameraservice/CameraService.h

diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h
index cab804e..2bf7b49 100644
--- a/services/camera/libcameraservice/CameraService.h
+++ b/services/camera/libcameraservice/CameraService.h
@@ -106,6 +106,10 @@
     void                playSound(sound_kind kind);
     void                releaseSound();
 
+    /////////////////////////////////////////////////////////////////////
+    // CameraDeviceFactory functionality
+    int                 getDeviceVersion(int cameraId, int* facing = NULL);
+
 
     /////////////////////////////////////////////////////////////////////
     // CameraClient functionality
@@ -372,7 +376,6 @@
     virtual void        binderDied(const wp<IBinder> &who);
 
     // Helpers
-    int                 getDeviceVersion(int cameraId, int* facing);
 
     bool                isValidCameraId(int cameraId);
 };