summaryrefslogtreecommitdiffstats
path: root/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 /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 'camera')
-rw-r--r--camera/Camera.cpp4
-rw-r--r--camera/ICameraService.cpp10
2 files changed, 4 insertions, 10 deletions
diff --git a/camera/Camera.cpp b/camera/Camera.cpp
index b81fe86..d43cb0b 100644
--- a/camera/Camera.cpp
+++ b/camera/Camera.cpp
@@ -116,13 +116,13 @@ status_t Camera::getCameraInfo(int cameraId,
return cs->getCameraInfo(cameraId, cameraInfo);
}
-sp<Camera> Camera::connect(int cameraId, bool force, bool keep)
+sp<Camera> Camera::connect(int cameraId)
{
ALOGV("connect");
sp<Camera> c = new Camera();
const sp<ICameraService>& cs = getCameraService();
if (cs != 0) {
- c->mCamera = cs->connect(c, cameraId, force, keep);
+ c->mCamera = cs->connect(c, cameraId);
}
if (c->mCamera != 0) {
c->mCamera->asBinder()->linkToDeath(c);
diff --git a/camera/ICameraService.cpp b/camera/ICameraService.cpp
index c74298a..f2d367e 100644
--- a/camera/ICameraService.cpp
+++ b/camera/ICameraService.cpp
@@ -56,15 +56,12 @@ public:
}
// connect to camera service
- virtual sp<ICamera> connect(const sp<ICameraClient>& cameraClient, int cameraId,
- bool force, bool keep)
+ virtual sp<ICamera> connect(const sp<ICameraClient>& cameraClient, int cameraId)
{
Parcel data, reply;
data.writeInterfaceToken(ICameraService::getInterfaceDescriptor());
data.writeStrongBinder(cameraClient->asBinder());
data.writeInt32(cameraId);
- data.writeInt32(force);
- data.writeInt32(keep);
remote()->transact(BnCameraService::CONNECT, data, &reply);
return interface_cast<ICamera>(reply.readStrongBinder());
}
@@ -96,10 +93,7 @@ status_t BnCameraService::onTransact(
case CONNECT: {
CHECK_INTERFACE(ICameraService, data, reply);
sp<ICameraClient> cameraClient = interface_cast<ICameraClient>(data.readStrongBinder());
- const int cameraId = data.readInt32();
- const int force = data.readInt32();
- const int keep = data.readInt32();
- sp<ICamera> camera = connect(cameraClient, cameraId, force, keep);
+ sp<ICamera> camera = connect(cameraClient, data.readInt32());
reply->writeStrongBinder(camera->asBinder());
return NO_ERROR;
} break;