summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
Diffstat (limited to 'services')
-rw-r--r--services/camera/libcameraservice/ProCamera2Client.cpp9
-rw-r--r--services/camera/libcameraservice/ProCamera2Client.h3
2 files changed, 2 insertions, 10 deletions
diff --git a/services/camera/libcameraservice/ProCamera2Client.cpp b/services/camera/libcameraservice/ProCamera2Client.cpp
index 1270751..575b075 100644
--- a/services/camera/libcameraservice/ProCamera2Client.cpp
+++ b/services/camera/libcameraservice/ProCamera2Client.cpp
@@ -230,14 +230,7 @@ status_t ProCamera2Client::cancelRequest(int requestId) {
return INVALID_OPERATION;
}
-//TODO: Remove
-status_t ProCamera2Client::requestStream(int streamId) {
- ALOGE("%s: not implemented yet", __FUNCTION__);
-
- return INVALID_OPERATION;
-}
-
-status_t ProCamera2Client::cancelStream(int streamId) {
+status_t ProCamera2Client::deleteStream(int streamId) {
ATRACE_CALL();
ALOGV("%s (streamId = 0x%x)", __FUNCTION__, streamId);
diff --git a/services/camera/libcameraservice/ProCamera2Client.h b/services/camera/libcameraservice/ProCamera2Client.h
index f69021e..1dec263 100644
--- a/services/camera/libcameraservice/ProCamera2Client.h
+++ b/services/camera/libcameraservice/ProCamera2Client.h
@@ -48,8 +48,7 @@ public:
bool streaming = false);
virtual status_t cancelRequest(int requestId);
- virtual status_t requestStream(int streamId);
- virtual status_t cancelStream(int streamId);
+ virtual status_t deleteStream(int streamId);
virtual status_t createStream(
int width,