summaryrefslogtreecommitdiffstats
path: root/include/camera
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2012-04-19 12:35:00 +0800
committerWu-cheng Li <wuchengli@google.com>2012-04-19 12:53:56 +0800
commit08ad5efcef90e24db2863c0f85972ed05fe848a2 (patch)
treef2eff3f033d360ac8043ba4f6ffa2d11520bebee /include/camera
parent9bd23229fdec1657398abc682ccccfce1c95f8aa (diff)
downloadframeworks_av-08ad5efcef90e24db2863c0f85972ed05fe848a2.zip
frameworks_av-08ad5efcef90e24db2863c0f85972ed05fe848a2.tar.gz
frameworks_av-08ad5efcef90e24db2863c0f85972ed05fe848a2.tar.bz2
Remove new camera connect API.
Applications are not resumed under the lock screen now. This API is not needed anymore. bug:5584464 Change-Id: I115daf6b647348617ec0fc05b626878c945b9b29
Diffstat (limited to 'include/camera')
-rw-r--r--include/camera/Camera.h2
-rw-r--r--include/camera/ICameraService.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/camera/Camera.h b/include/camera/Camera.h
index 3fedea0..234e165 100644
--- a/include/camera/Camera.h
+++ b/include/camera/Camera.h
@@ -72,7 +72,7 @@ public:
static int32_t getNumberOfCameras();
static status_t getCameraInfo(int cameraId,
struct CameraInfo* cameraInfo);
- static sp<Camera> connect(int cameraId, bool force, bool keep);
+ static sp<Camera> connect(int cameraId);
virtual ~Camera();
void init();
diff --git a/include/camera/ICameraService.h b/include/camera/ICameraService.h
index 97e3169..7d70c1e 100644
--- a/include/camera/ICameraService.h
+++ b/include/camera/ICameraService.h
@@ -42,7 +42,7 @@ public:
virtual status_t getCameraInfo(int cameraId,
struct CameraInfo* cameraInfo) = 0;
virtual sp<ICamera> connect(const sp<ICameraClient>& cameraClient,
- int cameraId, bool force, bool keep) = 0;
+ int cameraId) = 0;
};
// ----------------------------------------------------------------------------