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
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 @@
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 @@
}
// 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 @@
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;
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 @@
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 @@
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;
};
// ----------------------------------------------------------------------------
diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp
index fd3f892..3ddad93 100755
--- a/media/libstagefright/CameraSource.cpp
+++ b/media/libstagefright/CameraSource.cpp
@@ -182,7 +182,7 @@
int32_t cameraId) {
if (camera == 0) {
- mCamera = Camera::connect(cameraId, false, false);
+ mCamera = Camera::connect(cameraId);
if (mCamera == 0) return -EBUSY;
mCameraFlags &= ~FLAGS_HOT_CAMERA;
} else {
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index dc3f083..92d1223 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -21,7 +21,6 @@
#include <stdio.h>
#include <sys/types.h>
#include <pthread.h>
-#include <time.h>
#include <binder/IPCThreadState.h>
#include <binder/IServiceManager.h>
@@ -34,7 +33,6 @@
#include <hardware/hardware.h>
#include <media/AudioSystem.h>
#include <media/mediaplayer.h>
-#include <utils/Condition.h>
#include <utils/Errors.h>
#include <utils/Log.h>
#include <utils/String16.h>
@@ -44,8 +42,6 @@
namespace android {
-#define WAIT_RELEASE_TIMEOUT 250 // 250ms
-
// ----------------------------------------------------------------------------
// Logging support -- this is for debugging only
// Use "adb shell dumpsys media.camera -v 1" to change it.
@@ -68,13 +64,6 @@
return IPCThreadState::self()->getCallingUid();
}
-static long long getTimeInMs() {
- struct timeval t;
- t.tv_sec = t.tv_usec = 0;
- gettimeofday(&t, NULL);
- return t.tv_sec * 1000LL + t.tv_usec / 1000;
-}
-
// ----------------------------------------------------------------------------
// This is ugly and only safe if we never re-create the CameraService, but
@@ -142,7 +131,7 @@
}
sp<ICamera> CameraService::connect(
- const sp<ICameraClient>& cameraClient, int cameraId, bool force, bool keep) {
+ const sp<ICameraClient>& cameraClient, int cameraId) {
int callingPid = getCallingPid();
sp<CameraHardwareInterface> hardware = NULL;
@@ -168,73 +157,27 @@
return NULL;
}
- if (keep && !checkCallingPermission(String16("android.permission.KEEP_CAMERA"))) {
- ALOGE("connect X (pid %d) rejected (no KEEP_CAMERA permission).", callingPid);
- return NULL;
- }
-
Mutex::Autolock lock(mServiceLock);
- // Check if there is an existing client.
- client = mClient[cameraId].promote();
- if (client != 0 &&
- cameraClient->asBinder() == client->getCameraClient()->asBinder()) {
- LOG1("connect X (pid %d) (the same client)", callingPid);
- return client;
- }
-
- if (!force) {
- if (mClient[cameraId].promote() != 0) {
- ALOGW("connect X (pid %d) rejected (existing client).", callingPid);
- return NULL;
- }
- mClient[cameraId].clear();
- if (mBusy[cameraId]) {
- ALOGW("connect X (pid %d) rejected (camera %d is still busy).",
- callingPid, cameraId);
- return NULL;
- }
- } else { // force == true
- int i = 0;
- long long start_time = getTimeInMs();
- while (i < mNumberOfCameras) {
- if (getTimeInMs() - start_time >= 3000LL) {
- ALOGE("connect X (pid %d) rejected (timeout 3s)", callingPid);
+ if (mClient[cameraId] != 0) {
+ client = mClient[cameraId].promote();
+ if (client != 0) {
+ if (cameraClient->asBinder() == client->getCameraClient()->asBinder()) {
+ LOG1("CameraService::connect X (pid %d) (the same client)",
+ callingPid);
+ return client;
+ } else {
+ ALOGW("CameraService::connect X (pid %d) rejected (existing client).",
+ callingPid);
return NULL;
}
-
- client = mClient[i].promote();
- if (client != 0) {
- if (client->keep()) {
- ALOGW("connect X (pid %d) rejected (existing client wants to keeps the camera)",
- callingPid);
- return NULL;
- } else {
- ALOGW("New client (pid %d, id=%d). Disconnect the existing client (id=%d).",
- callingPid, cameraId, i);
- // Do not hold mServiceLock because disconnect will try to get it.
- mServiceLock.unlock();
- client->notifyCallback(CAMERA_MSG_ERROR, CAMERA_ERROR_RELEASED, 0, &i);
- client->waitRelease(WAIT_RELEASE_TIMEOUT);
- client->disconnectInternal(false);
- mServiceLock.lock();
- // Restart from the first client because a new client may have connected
- // when mServiceLock is unlocked.
- i = 0;
- continue;
- }
- }
-
- if (mBusy[i]) {
- // Give the client a chance to release the hardware.
- mServiceLock.unlock();
- usleep(10 * 1000);
- mServiceLock.lock();
- i = 0; // Restart from the first client
- continue;
- }
-
- i++;
}
+ mClient[cameraId].clear();
+ }
+
+ if (mBusy[cameraId]) {
+ ALOGW("CameraService::connect X (pid %d) rejected"
+ " (camera %d is still busy).", callingPid, cameraId);
+ return NULL;
}
struct camera_info info;
@@ -252,13 +195,7 @@
return NULL;
}
- client = new Client(this, cameraClient, hardware, cameraId, info.facing,
- callingPid, keep);
- // We need to clear the hardware here. After the destructor of mServiceLock
- // finishes, a new client may connect and disconnect this client. If this
- // reference is not cleared, the destructor of CameraHardwareInterface
- // cannot run. The new client will not be able to connect.
- hardware.clear();
+ client = new Client(this, cameraClient, hardware, cameraId, info.facing, callingPid);
mClient[cameraId] = client;
LOG1("CameraService::connect X (id %d)", cameraId);
return client;
@@ -399,7 +336,7 @@
CameraService::Client::Client(const sp<CameraService>& cameraService,
const sp<ICameraClient>& cameraClient,
const sp<CameraHardwareInterface>& hardware,
- int cameraId, int cameraFacing, int clientPid, bool keep) {
+ int cameraId, int cameraFacing, int clientPid) {
int callingPid = getCallingPid();
LOG1("Client::Client E (pid %d, id %d)", callingPid, cameraId);
@@ -409,7 +346,6 @@
mCameraId = cameraId;
mCameraFacing = cameraFacing;
mClientPid = clientPid;
- mKeep = keep;
mMsgEnabled = 0;
mSurface = 0;
mPreviewWindow = 0;
@@ -544,24 +480,18 @@
}
void CameraService::Client::disconnect() {
- disconnectInternal(true);
-}
-
-void CameraService::Client::disconnectInternal(bool needCheckPid) {
int callingPid = getCallingPid();
- LOG1("disconnectInternal E (pid %d)", callingPid);
+ LOG1("disconnect E (pid %d)", callingPid);
Mutex::Autolock lock(mLock);
- if (needCheckPid) {
- if (checkPid() != NO_ERROR) {
- ALOGW("different client - don't disconnect");
- return;
- }
+ if (checkPid() != NO_ERROR) {
+ ALOGW("different client - don't disconnect");
+ return;
+ }
- if (mClientPid <= 0) {
- LOG1("camera is unlocked (mClientPid = %d), don't tear down hardware", mClientPid);
- return;
- }
+ if (mClientPid <= 0) {
+ LOG1("camera is unlocked (mClientPid = %d), don't tear down hardware", mClientPid);
+ return;
}
// Make sure disconnect() is done once and once only, whether it is called
@@ -588,16 +518,8 @@
mCameraService->removeClient(mCameraClient);
mCameraService->setCameraFree(mCameraId);
- mReleaseCondition.signal();
- LOG1("disconnectInternal X (pid %d)", callingPid);
-}
-
-void CameraService::Client::waitRelease(int ms) {
- Mutex::Autolock lock(mLock);
- if (mHardware != 0) {
- mReleaseCondition.waitRelative(mLock, ms * 1000000);
- }
+ LOG1("disconnect X (pid %d)", callingPid);
}
// ----------------------------------------------------------------------------
@@ -1330,11 +1252,6 @@
return -1;
}
-// Whether the client wants to keep the camera from taking
-bool CameraService::Client::keep() const {
- return mKeep;
-}
-
// ----------------------------------------------------------------------------
static const int kDumpLockRetries = 50;
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h
index 7972201..5b63399 100644
--- a/services/camera/libcameraservice/CameraService.h
+++ b/services/camera/libcameraservice/CameraService.h
@@ -46,8 +46,7 @@
virtual int32_t getNumberOfCameras();
virtual status_t getCameraInfo(int cameraId,
struct CameraInfo* cameraInfo);
- virtual sp<ICamera> connect(const sp<ICameraClient>& cameraClient, int cameraId,
- bool force, bool keep);
+ virtual sp<ICamera> connect(const sp<ICameraClient>& cameraClient, int cameraId);
virtual void removeClient(const sp<ICameraClient>& cameraClient);
// returns plain pointer of client. Note that mClientLock should be acquired to
// prevent the client from destruction. The result can be NULL.
@@ -119,8 +118,7 @@
const sp<CameraHardwareInterface>& hardware,
int cameraId,
int cameraFacing,
- int clientPid,
- bool keep);
+ int clientPid);
~Client();
// return our camera client
@@ -179,19 +177,12 @@
const sp<IBinder>& binder,
const sp<ANativeWindow>& window);
- void disconnectInternal(bool needCheckPid);
- bool keep() const;
- void waitRelease(int ms);
-
-
// these are initialized in the constructor.
sp<CameraService> mCameraService; // immutable after constructor
sp<ICameraClient> mCameraClient;
int mCameraId; // immutable after constructor
int mCameraFacing; // immutable after constructor
pid_t mClientPid;
- // Client wants to keep the camera from taking by other clients.
- bool mKeep;
sp<CameraHardwareInterface> mHardware; // cleared after disconnect()
int mPreviewCallbackFlag;
int mOrientation; // Current display orientation
@@ -199,8 +190,6 @@
// Ensures atomicity among the public methods
mutable Mutex mLock;
- // This will get notified when the hardware is released.
- Condition mReleaseCondition;
// This is a binder of Surface or SurfaceTexture.
sp<IBinder> mSurface;
sp<ANativeWindow> mPreviewWindow;