summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChien-Yu Chen <cychen@google.com>2017-09-19 19:31:37 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-19 19:31:37 +0000
commitd1d01a1beb835dee268f44f13380b37906033cba (patch)
tree7a00f0824e1d253044ea816cad02809a8e1c0fce
parenta7ccafd4d991d62218027ec668199fc02d085402 (diff)
parent1e830e1db2f5600eeedb8d7ed0a3abcf6770497d (diff)
downloadeasel-d1d01a1beb835dee268f44f13380b37906033cba.tar.gz
pbcamera: Update API to avoid deadlock
am: 1e830e1db2 Change-Id: I636948f840acb768a46da2f3c20a23ff00e73629
-rw-r--r--camera/libhdrplusclient/include/HdrPlusClient.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/camera/libhdrplusclient/include/HdrPlusClient.h b/camera/libhdrplusclient/include/HdrPlusClient.h
index 7896c89..40905cc 100644
--- a/camera/libhdrplusclient/include/HdrPlusClient.h
+++ b/camera/libhdrplusclient/include/HdrPlusClient.h
@@ -33,7 +33,9 @@ namespace android {
*/
class HdrPlusClient {
public:
- HdrPlusClient() {};
+ // HdrPlusClientListener is the listener to receive callbacks from HDR+ client. The listener
+ // must be valid during the life cycle of HdrPlusClient
+ HdrPlusClient(HdrPlusClientListener *) {};
/*
* The recommended way to create an HdrPlusClient instance is via
* EaselManagerClient::openHdrPlusClientAsync() or EaselManagerClient::openHdrPlusClientAsync().
@@ -47,17 +49,12 @@ public:
*
* If EaselManagerClient is used to create the HdrPlusClient, it is already connected.
*
- * listener is the listener to receive callbacks from HDR+ client.
- *
* Returns:
* 0: on success.
* -EEXIST: if it's already connected.
* -ENODEV: if connecting failed due to a serious error.
*/
- virtual status_t connect(HdrPlusClientListener *listener) = 0;
-
- // Disconnect from HDR+ service.
- virtual void disconnect() = 0;
+ virtual status_t connect() = 0;
/*
* Set the static metadata of current camera device.