diff options
| author | Igor Murashkin <iam@google.com> | 2013-05-08 15:03:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-08 15:03:34 -0700 |
| commit | d354abf5658a9da89762e09ae46404ab6b1c9bae (patch) | |
| tree | 2cd7974af0d732b6cf72ae02f1e646b98aef4e15 /services/camera/libcameraservice/CameraService.h | |
| parent | 1f7d356fa094b975ad2ebf9217be6abba2c70825 (diff) | |
| parent | a790258aa5061a18ef455061de914c025fa86ded (diff) | |
| download | frameworks_av-d354abf5658a9da89762e09ae46404ab6b1c9bae.zip frameworks_av-d354abf5658a9da89762e09ae46404ab6b1c9bae.tar.gz frameworks_av-d354abf5658a9da89762e09ae46404ab6b1c9bae.tar.bz2 | |
am a790258a: am a5751c3a: Merge "Camera: Hotplug - conditionally transition to PRESENT when clients disconnect" into jb-mr2-dev
* commit 'a790258aa5061a18ef455061de914c025fa86ded':
Camera: Hotplug - conditionally transition to PRESENT when clients disconnect
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 bb3fb25..eaa316a 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -343,14 +343,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); |