Treehugger Robot
ecf3a1503a
Merge "ExternalCameraHAL: Check for empty native handle instead of null." into main am: 7e4037cf01 am: b6452b7ad8 am: a75bf4a77a
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2787022
Change-Id: I8cc9bec724e89264483b8f2754af83e06e38dc0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-03 02:50:33 +00:00
Treehugger Robot
7e4037cf01
Merge "ExternalCameraHAL: Check for empty native handle instead of null." into main
2023-11-03 01:10:16 +00:00
Avichal Rakesh
e6a88a8119
ExternalCameraHAL: Check for empty native handle instead of null.
...
AIDL cannot send nullptr when parceling NativeHandles. Instead, it
sends an empty handle. Logic which previously relied on null
checks should now rely on checking if the native_handle is
empty or not.
This CL updates ExternalCameraUtils to check for empty handles
instead.
Bug: 299170474
Test: CameraAidlTest#processCaptureRequestInvalidBuffer passes
Change-Id: Id4ba928defaa061708a3c1cd68aa510b376f6cb3
2023-11-02 17:27:43 -07:00
Xin Li
11ee4fea87
Merge android14-tests-dev
...
Bug: 263910020
Merged-In: I770dc5620648df2eab608e030c5e76cf190f315d
Change-Id: If4fe726d538386d70061e8051299d8fb393ef5df
2023-10-10 16:17:14 -07:00
Sergiu Ferentz
31b637fd90
Merge "Bump android.hardware.graphics.common V4->V5" into main
2023-10-09 08:27:26 +00:00
Treehugger Robot
b6863cf979
Merge "Revert "Revert "Convert from HIDL mapper to libui GraphicBufferM..."" into main
2023-10-04 01:56:09 +00:00
sergiuferentz
7d7a24d5f6
Bump android.hardware.graphics.common V4->V5
...
Test: Build
Bug: 291142745
Change-Id: Ib0002feb982ffcc37fa7b69493c644b7a835cf4f
2023-10-03 16:14:03 +00:00
Tang Lee
cc29bdd2d3
Merge "Return ILLEGAL_ARGUMENT for setting null callback" into main
2023-10-03 03:14:52 +00:00
Devin Moore
523660cd87
Revert "Revert "Convert from HIDL mapper to libui GraphicBufferM..."
...
Revert submission 24913374-revert-24747509-camera_fail2-OVHUVTAXRP
Reason for revert: 32-bit TV build is fixed with `%zu` instead of `%lu` for size_t argument.
Reverted changes: /q/submissionid:24913374-revert-24747509-camera_fail2-OVHUVTAXRP
Change-Id: I16287ce2dbea034db41450a3a5e9c3f729e76335
2023-10-02 15:55:11 +00:00
Michael Stokes
f9fcfe3794
Merge "Revert "Convert from HIDL mapper to libui GraphicBufferMapper"" into main
2023-10-02 10:21:06 +00:00
Michael Stokes
49ba82ce11
Revert "Convert from HIDL mapper to libui GraphicBufferMapper"
...
Revert submission 24747509-camera_fail2
Reason for revert: DroidMonitor-triggered revert due to breakage
b/302990858.
This may cause CtsAppOpsTestCases b/300115646 to fail again,
unfortunately (b/300115646).
Bug: 302990858
Reverted changes: /q/submissionid:24747509-camera_fail2
Change-Id: I0191b3ee88846f5b2c6e37ebd6be6d1369d9dba9
2023-10-02 09:56:59 +00:00
Tang Lee
4be4471d46
Return ILLEGAL_ARGUMENT for setting null callback
...
Bug: 299182872
Test: Run VTS with external USB camera
vts-tradefed
> run vts -m VtsAidlHalCameraProvider_TargetTest -t \
PerInstance/CameraAidlTest#setCallback/0_android_hardware_camera_provider_ICameraProvider_external_0 \
--logcat-on-failure --logcat-on-failure-size 8192000 \
--bugreport-on-failure --screenshot-on-failure
Change-Id: I013e3770ddbdcf6475e0927449af6183dcc37a8e
2023-10-02 07:18:16 +00:00
Devin Moore
b22961072f
Merge "Convert from HIDL mapper to libui GraphicBufferMapper" into main
2023-09-29 14:57:02 +00:00
Rucha Katakwar
5d0f9d16e3
Camera: Flash strength control during camera use.
...
Auto-generated file from changes in metadata_definitions.xml
Bug: 238348881
Test: Build Successful
Change-Id: Ic6aec9b2135b0b2a2d24d8204900b8bad52d6725
2023-09-20 11:43:03 -07:00
Devin Moore
5e154097aa
Convert from HIDL mapper to libui GraphicBufferMapper
...
HIDL mapper HAL is deprecated and instead of adding more support for the
new replacement explicitly, we can move the GraphicBufferMapper which
handles all of the backwards compatbility with the HIDL HALs for us.
Test: atest CtsCameraTestCases CtsAppOpsTestCases
Bug: 285605852
Bug: 300115646
Change-Id: Ib97e429a0f3dd1c66ec008fbf3860c9c5667bddd
2023-09-19 21:56:38 +00:00
Treehugger Robot
0d4bf3b76c
Merge "Camera VTS: Verify high speed video configurations" into main am: 607f7e7ff7 am: 68d44aa5e2 am: 8125e862c3 am: fc56ae19a8 am: 460f902f7d
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2585399
Change-Id: I5dfbe1db392c9a64a8653b220c6a8fc3dcaf3982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-18 11:43:24 +00:00
Treehugger Robot
8125e862c3
Merge "Camera VTS: Verify high speed video configurations" into main am: 607f7e7ff7 am: 68d44aa5e2
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2585399
Change-Id: Ia6aa1f2395bbcf7778ea5c6820cf778168df1296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-18 09:03:03 +00:00
Treehugger Robot
68d44aa5e2
Merge "Camera VTS: Verify high speed video configurations" into main am: 607f7e7ff7
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2585399
Change-Id: Ib20ae0eb0bc7466acb39e7eb0409fde8641f6070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-18 08:04:22 +00:00
Kwangkyu Park
4b7fd45612
Camera VTS: Verify high speed video configurations
...
Verify high speed video configurations based on the tag definition.
Bug: 274392420
Test: Ran on cuttlefish
Change-Id: Ie64415cc8694d8f4da59a01f6051bc847ae30fa7
2023-09-15 14:10:09 +09:00
Emilian Peev
190fff1c6a
Camera VTS: Wait for camera provider to become active am: bd4cdc6a9a am: 9610556686 am: a4a1654db2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24665985
Change-Id: I99ac896c3192ef4a62e25bccbab92159c8e3bb78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-05 22:45:22 +00:00
Emilian Peev
16ce2fc577
Camera VTS: Wait for camera provider to become active am: bd4cdc6a9a am: 9610556686
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24665985
Change-Id: Iefca832a6c244f0df88cf9e3898da282612a95d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-05 21:50:25 +00:00
Emilian Peev
bd4cdc6a9a
Camera VTS: Wait for camera provider to become active
...
Use "AServiceManager_waitForService" instead of
"AServiceManager_getService" to wait for any camera
providers that might be using the lazy mechanism and
are not running all the time.
Bug: 297965980
Test: atest VtsAidlHalCameraProvider_TargetTest
Change-Id: I6374dc768cd1068885668f927f902dcee44a7a42
2023-09-05 18:18:49 +00:00
Xin Li
879960bdce
Merge Android U (ab/10368041)
...
Bug: 291102124
Merged-In: I7b6fffac2ada0e039f79bad8cc9b4d954e9c3460
Change-Id: I9466127d8d0fa38df36ca99f704853b2db871e67
2023-08-25 13:29:30 -07:00
Treehugger Robot
b58bdcc974
Merge "Use String8/16 c_str [camera]" into udc-dev-plus-aosp am: f9da01134b am: b2e932d474 am: a2c25cfbec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24528988
Change-Id: I6e83c13f0f0b6b89931bdcac81e79326d3841aa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 18:05:29 +00:00
Tomasz Wasilczyk
353d4c5c75
Use String8/16 c_str [camera]
...
Bug: 295394788
Test: make checkbuild
Change-Id: I7ca371112e891f4f40673b5c34e3b8ccc41841bf
Merged-In: I7ca371112e891f4f40673b5c34e3b8ccc41841bf
2023-08-24 17:07:46 +00:00
Tomasz Wasilczyk
dbec48bbd2
Use String8/16 c_str [camera]
...
Bug: 295394788
Test: make checkbuild
Change-Id: I7ca371112e891f4f40673b5c34e3b8ccc41841bf
2023-08-23 19:47:07 +00:00
Tang Lee
65382f6a50
Fix external camera HAL crashes
...
External USB camera hal service crashes when disconnecting the camera.
ExternalCameraDeviceSession's desctructor is called and deletes mLock,
but mBufferRequestThread is still running and waiting on the same
mLock, which causes the "pthread_mutex_lock called on a destroyed
mutex" error.
Fix the issue by stopping the thread in destructor. Also refactors the
functions and remove unused conditions.
Bug: 289741662
Test: Test with USB camera
Change-Id: I06b1ff6e192a4bca16822785d65d68a6aae53414
2023-08-01 10:32:46 +00:00
Sally Qi
3def856602
Use android.hardware.graphics.common wrap.
...
Bug: 291745893
Test: builds
Change-Id: I4de7ecf4593957d4ef76ff3d66b1b7daa0d3f11a
2023-07-20 16:56:07 +08:00
Austin Borger
0a01e96a73
Camera VTS: Properly initialize Stream in various places am: 263e362091 am: 45063e6c9f am: 32b90a4a29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23850975
Change-Id: I6f7f697d044d47b3c5c8e15457a6f06202bc4bf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 21:29:01 +00:00
Austin Borger
0475dfe328
Camera VTS: Properly initialize Stream in various places am: 263e362091 am: 45063e6c9f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23850975
Change-Id: I4450a41690668dcf2377cca07c48e258ec046b28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 20:41:12 +00:00
Austin Borger
263e362091
Camera VTS: Properly initialize Stream in various places
...
useCase and colorSpace are not explicitly initialized. colorSpace must
be explicitly initialized to UNSPECIFIED, as its default value is not
zero. Without initialization, the HAL will receive incorrect Stream
data.
Bug: 287305593
Test: Ran full VTS test on Cuttlefish / OEM testing.
Change-Id: I6a29600b5dc06ebdc61b38e0585204fe52d590c2
2023-06-29 00:49:17 +00:00
Bharatt Kukreja
043fdd018b
Merge "Camera: Add links to mandatory stream combination tables" into udc-dev am: b082ae031f am: 9d81679aa5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23680404
Change-Id: Ia7fc47c6d205e171f64c75474a914ffa74d2526a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 20:53:13 +00:00
Bharatt Kukreja
864d021f33
Merge "Camera: Add links to mandatory stream combination tables" into udc-dev am: b082ae031f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23680404
Change-Id: Ie8b6336f9f0e03e013ce2b23a42d0a9d071b4319
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 20:10:18 +00:00
Bharatt Kukreja
3e4fbc9a22
Camera: Add links to mandatory stream combination tables
...
Bug: 271143048
Test: Documentation change
Change-Id: I570994c084e730750aa5205b7f97c7546d75b58d
2023-06-14 21:49:32 +00:00
Avichal Rakesh
4a675fbfd1
camera: Fix prefix length path for External Camera HAL am: b8863f6a03 am: e1390f059f am: f617111ca5
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2386907
Change-Id: I0d1a4f3fcb4747dfac1d3f98e967d0b2bd8e6646
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 02:46:14 +00:00
Avichal Rakesh
e1390f059f
camera: Fix prefix length path for External Camera HAL am: b8863f6a03
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2386907
Change-Id: I1ccf1ab9bc2520801b55741219def26675f381fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 01:31:57 +00:00
Avichal Rakesh
b8863f6a03
camera: Fix prefix length path for External Camera HAL
...
The default External Camera HAL accidentally used `sizeof` on a `char *`
to get the length of the string. This "worked" because the string in
question "/dev/" has length of 5, while on a 32-bit system `char *`
has a size of 4. This difference of 1 was handled a few lines later.
However on 64-bit system `sizeof(char *)` returns 8 which breaks the
logic later in code.
As `sizeof` was being used as a proxy for strlen, this CL converts the
uses C++'s std::char_traits::length to determine the string lengths
at compile time.
Bug: 265168485
Test: Manually tested that the calculated length is correct after the
fix.
Change-Id: I92481a2bcb74fdbbb483ef552168debf07b2d68a
2023-06-08 17:00:35 -07:00
Steven Moreland
503ed3ae2f
Merge "Camera Provider VTS: auto-gen" am: 433f0ac41d am: 7967c1a9e4 am: 576f0a3f05
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2611867
Change-Id: Iefa1bb1752e0ca033350af12af5d1e909e402db0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 20:07:30 +00:00
Steven Moreland
7967c1a9e4
Merge "Camera Provider VTS: auto-gen" am: 433f0ac41d
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2611867
Change-Id: I7de9f8d7e42a242ad88d72d55aa56a55e05d3951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 17:59:54 +00:00
Steven Moreland
a405bae2d1
Camera Provider VTS: auto-gen
...
Upload for stashing. I need to redownload/rebuild Android to test
the new feature.
Bug: N/A
Test: atest VtsAidlHalCameraProvider_TargetTest
Change-Id: Ic9aa621b6d3e1297c83add88283559915e36311e
2023-06-05 19:55:32 +00:00
Shuzhen Wang
38ddb278b3
Camera: Adjust VTS tests for zoom override latency
...
Now that the zoom override latency requirement is reduced to 1 frame,
adjust the VTS test accordingly.
Test: Run VtsAidlHalCameraProvider_TargetTest on Pixel
Bug: 283196724
Change-Id: Ie05106cd79549de6b91f94b5c25ffae768982a1b
2023-05-22 09:42:38 -07:00
Austin Borger
8e9ac0249a
Camera VTS: Close the session at the end of stream configuration validation
...
Not calling mSession->close means that there will be multiple concurrent
sessions open, which may not be supported by the device.
Bug: 280559094
Test: Ran on cuttlefish
Change-Id: Ie622fabd4d0be2f8442e90d1c781bbf905172270
2023-05-04 22:57:49 +00:00
Xin Li
71a948bc4c
Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994
...
Bug: 275386652
Merged-In: Icd15f6e7bfdd7b3e3d0d4b407195258d4171c560
Change-Id: I115d5b25fc5b997a76ac4672262945f3393a9c78
2023-04-18 16:34:16 -07:00
Shuzhen Wang
e1dcc40ec3
Camera: VTS: Fix fence fd double close am: 3ad137edbb am: 2603479470 am: 7c4bb95a18 am: 36f18e9327
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2539830
Change-Id: Ifa023065ee2380dd87c898275fcd0d1cf261fcf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 01:43:17 +00:00
Shuzhen Wang
36f18e9327
Camera: VTS: Fix fence fd double close am: 3ad137edbb am: 2603479470 am: 7c4bb95a18
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2539830
Change-Id: I3fe1f8c5da5fcc4c18ffe9ef19099145c4b5f3b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 01:24:09 +00:00
Shuzhen Wang
2603479470
Camera: VTS: Fix fence fd double close am: 3ad137edbb
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2539830
Change-Id: I6f75051e3ac3bf9d3976969ead45da306d2ff10a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 00:49:20 +00:00
Shuzhen Wang
3ad137edbb
Camera: VTS: Fix fence fd double close
...
Fence fd is closed when processCaptureResult returns. In order to
wait for the release fence *after* processCaptureResult returns,
the fence fd needs to be duped.
Test: Vendor testing
Bug: 241281568
Change-Id: Ib74f9bb141802713b476a2ef48a2252125a7915d
2023-04-17 05:02:05 +00:00
Alex Buynytskyy
ec1198d941
UpsideDownCake is now 34
...
Ignore-AOSP-First: UpsideDownCake Finalization
Bug: 275409981
Test: build
Change-Id: I832ab7a8b5445ba85e27bbcf5be64906bfa0e5be
2023-04-07 23:41:20 +00:00
Treehugger Robot
41e0286ba5
Merge "Camera: VTS: Wait for release fence before consuming buffers" into android13-tests-dev am: 1c8377c24c am: 13f7e14af3 am: 741506640a
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2520900
Change-Id: Idaefcf5c650012829792b5db1760b90045dd653a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 18:47:40 +00:00
Treehugger Robot
8c242dcfac
Merge "Camera: VTS: Wait for release fence before consuming buffers" into android13-tests-dev am: 1c8377c24c am: c3b6c6c691 am: 35bd55b0d7
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2520900
Change-Id: I5a993cbe326db709d496cdadfabf18b774353c5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 18:46:48 +00:00