summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ravneet Dhanjal <rdhanjal@google.com> 2024-05-31 18:51:43 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-05-31 18:51:43 +0000
commit673667677cda176d9693346080a328369fdd0491 (patch)
treed6cc280ca0ed9dfeea41d1ac93402cabc9ae2568
parentf99d2e86f9e6ef7b440aef164fc98aa0da674c3c (diff)
parentac71396479f9eb113d1da07baa215ae4a57554bc (diff)
Merge "Use detachFd for getPlanes in CameraExtensions" into main
-rw-r--r--packages/services/CameraExtensionsProxy/src/com/android/cameraextensions/CameraExtensionsProxyService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/services/CameraExtensionsProxy/src/com/android/cameraextensions/CameraExtensionsProxyService.java b/packages/services/CameraExtensionsProxy/src/com/android/cameraextensions/CameraExtensionsProxyService.java
index 7fcef9c90812..c0b354cc69d9 100644
--- a/packages/services/CameraExtensionsProxy/src/com/android/cameraextensions/CameraExtensionsProxyService.java
+++ b/packages/services/CameraExtensionsProxy/src/com/android/cameraextensions/CameraExtensionsProxyService.java
@@ -2373,7 +2373,7 @@ public class CameraExtensionsProxyService extends Service {
public Plane[] getPlanes() {
throwISEIfImageIsInvalid();
if (mPlanes == null) {
- int fenceFd = mParcelImage.fence != null ? mParcelImage.fence.getFd() : -1;
+ int fenceFd = mParcelImage.fence != null ? mParcelImage.fence.detachFd() : -1;
mGraphicBuffer = GraphicBuffer.createFromHardwareBuffer(mParcelImage.buffer);
mPlanes = ImageReader.initializeImagePlanes(mParcelImage.planeCount, mGraphicBuffer,
fenceFd, mParcelImage.format, mParcelImage.timestamp,