Camera: Remove flag 'surface_ipc'
Flag: EXEMPT removal of flag 'surface_ipc'
Bug: 365555183
Test: Successful build
Change-Id: Iff2c3b59689e67f4a260a7ddb5e2f86c100347da
diff --git a/camera/camera_platform.aconfig b/camera/camera_platform.aconfig
index 3d7a051..01e8efb 100644
--- a/camera/camera_platform.aconfig
+++ b/camera/camera_platform.aconfig
@@ -123,16 +123,6 @@
flag {
namespace: "camera_platform"
- name: "surface_ipc"
- description: "Optimize Surface binder IPC"
- bug: "323292530"
- metadata {
- purpose: PURPOSE_BUGFIX
- }
-}
-
-flag {
- namespace: "camera_platform"
name: "extension_10_bit"
is_exported: true
description: "Enables 10-bit support in the camera extensions."
diff --git a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
index 04867b9..83c8a38 100644
--- a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
+++ b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
@@ -687,11 +687,7 @@
}
}
- if (flags::surface_ipc()) {
- res = mConsumer->setMaxDequeuedBufferCount(mTotalBufferCount - maxConsumerBuffers);
- } else {
- res = native_window_set_buffer_count(mConsumer.get(), mTotalBufferCount);
- }
+ res = mConsumer->setMaxDequeuedBufferCount(mTotalBufferCount - maxConsumerBuffers);
if (res != OK) {
ALOGE("%s: Unable to set buffer count for stream %d",
__FUNCTION__, mId);
@@ -1035,7 +1031,7 @@
status_t Camera3OutputStream::getEndpointUsageForSurface(uint64_t *usage,
const sp<Surface>& surface) {
bool internalConsumer = (mConsumer.get() != nullptr) && (mConsumer == surface);
- if (mConsumerUsageCachedValue.has_value() && flags::surface_ipc() && internalConsumer) {
+ if (mConsumerUsageCachedValue.has_value() && internalConsumer) {
*usage = mConsumerUsageCachedValue.value();
return OK;
}