diff options
| author | 2024-05-31 19:03:02 +0000 | |
|---|---|---|
| committer | 2024-05-31 19:03:02 +0000 | |
| commit | 86a93d47067a612c869f5229fc539324bc05867a (patch) | |
| tree | 3dc5d11933d46776ffb9d9daa924997361aeb572 /packages | |
| parent | 36dec1886a480eff7b0db62fb567df23f453beb8 (diff) | |
| parent | 673667677cda176d9693346080a328369fdd0491 (diff) | |
Merge "Use detachFd for getPlanes in CameraExtensions" into main am: 673667677c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3040395
Change-Id: I704e30274903f8d75f2d11aba9391602b8770e1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/services/CameraExtensionsProxy/src/com/android/cameraextensions/CameraExtensionsProxyService.java | 2 |
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 e0fe88a1a167..5a2d26502003 100644 --- a/packages/services/CameraExtensionsProxy/src/com/android/cameraextensions/CameraExtensionsProxyService.java +++ b/packages/services/CameraExtensionsProxy/src/com/android/cameraextensions/CameraExtensionsProxyService.java @@ -2450,7 +2450,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, |