diff options
| author | Igor Murashkin <iam@google.com> | 2013-05-01 15:42:20 -0700 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2013-05-02 18:04:38 -0700 |
| commit | 93747b9c7724f690b3068300514c05629e0b0a3e (patch) | |
| tree | 1c5874e91c55b47fa012c0581c0d6e0abd26cdfe /services/camera/libcameraservice/CameraService.h | |
| parent | 2628bc9d1261c2942f3506baca348ccd71ea9c86 (diff) | |
| download | frameworks_av-93747b9c7724f690b3068300514c05629e0b0a3e.zip frameworks_av-93747b9c7724f690b3068300514c05629e0b0a3e.tar.gz frameworks_av-93747b9c7724f690b3068300514c05629e0b0a3e.tar.bz2 | |
Camera: Hotplug - conditionally transition to PRESENT when clients disconnect
Fixes an issue where a client could unconditionally transition to PRESENT
after a client disconnects, even though the underlying HAL status was actually
NOT_PRESENT or ENUMERATING.
Bug: 8780114
Change-Id: I68adb5fc819eec3b046ddcb2507b84bedc999a0f
Diffstat (limited to 'services/camera/libcameraservice/CameraService.h')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h index 8cb1691..710f164 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -341,14 +341,12 @@ private: ICameraServiceListener::Status getStatus(int cameraId) const; + typedef Vector<ICameraServiceListener::Status> StatusVector; // Broadcast the new status if it changed (locks the service mutex) void updateStatus( ICameraServiceListener::Status status, - int32_t cameraId); - // Call this one when the service mutex is already held (idempotent) - void updateStatusUnsafe( - ICameraServiceListener::Status status, - int32_t cameraId); + int32_t cameraId, + const StatusVector *rejectSourceStates = NULL); // IBinder::DeathRecipient implementation virtual void binderDied(const wp<IBinder> &who); |