Commit graph

401 commits

Author SHA1 Message Date
Emilian Peev
b75aa350e7 camera: Add support for individual physical camera requests
Multi-camera devices should be able to accept and process
individual settings for all physical sensors backing the
logical camera. 'CaptureRequest' must be extended to hold
these additional physical camera settings.

Test: Manual using camera application,
camera_client_test,
run vts --skip-all-system-status-check --skip-preconditions
--primary-abi-only --module VtsHalCameraProviderV2_4Target -l INFO
Bug: 64691172
Change-Id: Ia38d1e7681a9385be7578c11e40f4e35e9101d75
2018-01-20 15:51:37 +00:00
Shuzhen Wang
82e36b3f8c camera: Add support for logical camera
- Add physical cameraId field in stream structure.
- Override processCaptureRequest due to physicalCameraId change.
- Update 3.3 metadata with logical camera characteristics.

Test: Camera CTS on Taimen, LogicalCamera CTS test on C1
Bug: 64691172
Change-Id: I65bd1ae38381ecb89fae439ae14b813c9bcc3248
2018-01-20 15:51:13 +00:00
Emilian Peev
37e1a5dcfd Camera: Include session parameters for 3.4 devices
To avoid glitches and unexpected behavior, session parameters
should be included in the stream configuration before invoking
capture requests.

Bug: 70560715
Test: run vts --skip-all-system-status-check --skip-preconditions
--primary-abi-only --module VtsHalCameraProviderV2_4Target -l INFO

Change-Id: Id4ecd40533157f1a3299099a984ffab21654548a
2018-01-20 15:47:31 +00:00
Chien-Yu Chen
5e8a1be6e6 camera: Add OIS data keys
Test: CTS
Bug: 64847201
Change-Id: I47f5d69f031ee0af8451fe87b746ca726400c55e
2018-01-19 16:22:59 -08:00
Yin-Chia Yeh
729eef72eb Camera: add new EXTERNAL hardware level
Bug: 64874137 63873538
Change-Id: I7063b3926c4ce649cba501467955a9885639f7be
2018-01-19 11:40:40 -08:00
TreeHugger Robot
32f4103dac Merge "camera: Add external flash mode key" 2018-01-19 04:19:24 +00:00
Guennadi Liakhovetski
e56eafc61d Merge "Camera: Fix hotplug" am: d7a0f2984d am: 78d88380d3
am: 99aaf673c5

Change-Id: I3e9566c4960c9f11376c7b0c8f377f9ccc1ac1ac
2018-01-18 20:20:55 +00:00
Treehugger Robot
d7a0f2984d Merge "Camera: Fix hotplug" 2018-01-18 20:11:39 +00:00
Steven Moreland
a6c5ff2c6d Update makefiles.
Some have missed being updated.

Bug: N/A
Test: N/A
Change-Id: I0925e85701f6e8b98f9b09bfafbed73469d1d185
2018-01-17 11:20:17 -08:00
Chien-Yu Chen
79f734b8f0 camera: Add external flash mode key
Test: CTS
Bug: 64847201
Change-Id: Ic99df793e4fe2b016c930c344eb64a264f004945
2018-01-11 10:58:29 -08:00
Emilian Peev
9fc7f3b467 camera: Correct 'availableSessionKeys' version
The metadata version for the available session keys should be 3.3 .

Bug: 64450664
Test: Builds, hidl-gen/hidl-doc are happy
Change-Id: Id53cfeda8c7d528d10c3dd26c64bdb56d9404cb2
2018-01-10 13:53:55 +00:00
Eino-Ville Talvala
e41911b65c Add MOTION_TRACKING capability/intent, and lens poseReference
Test: Builds, hidl-gen/hidl-doc are happy
Bug: 63629224
Change-Id: Ibf8a57c3d917f24db6ff269461d55f177ec55fcf
2018-01-05 12:02:48 -08:00
Guennadi Liakhovetski
7b7ede7ebd Camera: Fix hotplug
According to the camera_module_t::get_number_of_cameras() description
in camera_common.h, it should only return the number of "fixed"
cameras, i.e. cameras, facing to the front and to the back. Any
cameras, with the facing value of "external," i.e. externally connected
cameras, should not be reported by it, instead they should later be
reported, using the
camera_module_callbacks_t::camera_device_status_change() callback.
However, this doesn't work. When a camera is reported this way, it is
ignored as unknown. Fix this by adding a new camera, when its status
change is reported.

Change-Id: I18874ed005f477e32fb723c00c16b67a81cde6ce
Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@intel.com>
2018-01-04 11:42:27 +01:00
Chien-Yu Chen
13cfbf07ff camera: Add device info version
Test: CTS
Bug: 64847201
Change-Id: I4e9002bb8ed47249eff00e54dfd3b31c97d28777
2018-01-03 14:39:59 -08:00
TreeHugger Robot
a557df85f0 Merge "Camera: Bump device version to 3.4" 2017-12-22 19:18:51 +00:00
TreeHugger Robot
1eab571c03 Merge "Add camera.metadata@3.3" 2017-12-22 00:16:57 +00:00
Emilian Peev
e18057b42f Camera: Bump device version to 3.4
Camera devices supporting version 3.4 will be able to receive
session parameters during the stream configuration phase.

Bug: 64450664
Test: Camera CTS
run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --primary-abi-only --module
VtsHalCameraProviderV2_4Target -l INFO

Change-Id: Ifd83bfe0e512fe75b63602b4aba98f4cc1cdeb53
2017-12-20 10:44:11 +00:00
guoyin.chen
bc164e1300 Merge "openmax header files have been relocated" am: 8e0f8836d9 am: 3794336021
am: fed56a4ed9

Change-Id: I55d350c1c00b989d0e41b98646b54d1f64bf92dc
2017-12-20 00:34:42 +00:00
guoyin.chen
fed56a4ed9 Merge "openmax header files have been relocated" am: 8e0f8836d9
am: 3794336021

Change-Id: I1a1fa65280343197f2dbc100b56153b028ea0adf
2017-12-20 00:32:05 +00:00
Eino-Ville Talvala
6d3feccd88 Add camera.metadata@3.3
To be used by camera.device@3.4; unfortunately the versioning is
now skewing since no metadata additions were needed for device@3.3

Includes the earlier-added control.afSceneChange entry.

Test: hidl-gen, hidl-doc, builds
Bug: 64847201
Change-Id: I341a018a7eccf63758e356e9b426a41b575ade9f
2017-12-19 12:01:10 -08:00
TreeHugger Robot
5ccd0eb248 Merge "Camera: add hardware level check" 2017-12-19 01:17:48 +00:00
guoyin.chen
1b1f65808a openmax header files have been relocated
openmax header files relocated at headers/media_plugin/media/openmax
Build error as below:
source path frameworks/native/include/media/openmax does not exist

Change-Id: Ifb43a8b47c9ecd7adc4ef715948c52015603ba40
Signed-off-by: guoyin.chen <guoyin.chen@nxp.com>
2017-12-19 01:57:58 +08:00
Yin-Chia Yeh
13774fd5f6 Camera: add hardware level check
To disallow HAL3 device advertise itself as LEGACY.

Test: ran on walleye
Change-Id: Ib0b98f32c401566323eee546ee23c7873c00aef0
2017-12-06 13:59:28 -08:00
Eino-Ville Talvala
cc08739452 camera.metadata@3.2: Auto-generate metadata enums
Replace hand-written types.hal with one autogenerated from the
metadata definitions, like the SDK, NDK, and camera_metadata C library
definitions are.

No changes to actual definitions; only formatting changes and basic
documentation of each entry are added.

Add the new hash of camera.metadata@3.2::types to current.txt.

Bug: 33262893
Test: Manual inspection of new vs. old types.hal, builds, hidl-doc output
   is acceptable
Change-Id: Idd8c228359e45de3609bc16ac19e878b0ed0a557
2017-12-05 12:27:52 -08:00
Steven Moreland
4e1e4081e4 Updating makefiles for hidl_interface.
Bug: 64487114
Test: manual
Merged-In: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
Change-Id: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
(cherry-picked from commit c2f829a1d2)
2017-12-03 10:31:49 -08:00
Steven Moreland
e5c6548346 Remove subdirs
Removing whenever I see these in code reviews.

Test: none
Merged-In: I4322f533a837d55618ec2ed2125e8966ace9d61d
Change-Id: I4322f533a837d55618ec2ed2125e8966ace9d61d
2017-11-28 14:23:43 -08:00
Steven Moreland
8b76a6b90d Remove subdirs
Removing whenever I see these in code reviews.

Test: none
Merged-In: I4322f533a837d55618ec2ed2125e8966ace9d61d
Change-Id: I4322f533a837d55618ec2ed2125e8966ace9d61d
2017-11-28 14:22:55 -08:00
Steven Moreland
fcca4e23b7 Remove subdirs
Removing whenever I see these in code reviews.

Test: none
Merged-In: I4322f533a837d55618ec2ed2125e8966ace9d61d
Change-Id: I4322f533a837d55618ec2ed2125e8966ace9d61d
2017-11-28 14:22:43 -08:00
Xin Li
bb9e38fef9 Merge commit '1a06284b24f5eb7bb9c1fea0817da8898b3b1bff' from
oc-mr1-dev-plus-aosp into stage-aosp-master

Change-Id: I2a044eb8c9981d0a8198ffe2df55559afbd76341
Merged-In: I4fb9f18884f7ef21162015a0032c4431444f7025
2017-11-14 12:08:38 -08:00
Steven Moreland
c2f829a1d2 Updating makefiles for hidl_interface.
Bug: 64487114
Test: manual
Merged-In: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
Change-Id: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
2017-11-13 11:39:07 -08:00
Steven Moreland
8db261bc99 Updating makefiles for hidl_interface.
Bug: 64487114
Test: manual
Merged-In: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
Change-Id: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
2017-11-13 10:00:18 -08:00
Steven Moreland
a1169dd600 Update makefiles for hidl_interface.
Bug: 35570956
Test: manual
Change-Id: I7a220b78ee081240e1dc30ef5672ba39e3e98375
2017-11-10 09:06:55 -08:00
Steven Moreland
771dff2a2d Update makefiles for transitive interfaces.
Transitive includes accidentally added by hidl-gen
were getting added to import lists. This import isn't
actually required and is now properly excluded from
hidl-gen update makefiles.

Bug: 65055216
Test: none
Merged-In: I4fb4de8ef5547a3081cd55b3c75f6288cc518ba6
Change-Id: I4fb4de8ef5547a3081cd55b3c75f6288cc518ba6
2017-11-10 08:48:15 -08:00
Steven Moreland
f390f03aa4 Update for Soong-only makefiles.
Test: pass
Bug: 33420795
Change-Id: Ibec6d1e38939b9e7566a96381439be2aac3bf8ca
2017-10-11 18:30:28 +00:00
Steven Moreland
1d7374c5e1 Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1 am: 6c811964a1
am: 116161d94e

Change-Id: I33643636e2511de77fdf7de57777eb67edee2e52
2017-10-11 16:39:21 +00:00
Steven Moreland
116161d94e Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1
am: 6c811964a1

Change-Id: I85ccbb4a15cd18938607f5bca4e065b9d7e0182b
2017-10-11 16:31:07 +00:00
Steven Moreland
0fff75dee1 Update for Soong java makefiles.
am: c3e80fa01e

Change-Id: Ia8835f9c95bd98a96f5fd3aff11191e7d3726fb9
2017-10-11 16:23:54 +00:00
Steven Moreland
c3e80fa01e Update for Soong java makefiles.
Test: pass
Bug: 33420795
Change-Id: Id9b1919a19b8ff682738cfb0869a479b4dbb4293
2017-10-10 23:07:20 +00:00
Steven Moreland
70bfb9d250 Merge "Update for hidl adapter module defaults." am: 988c977079 am: 861651985f am: b53e6ad535
am: 9a17f41f6f

Change-Id: I78d9292068b372238554fd9d35128e69f5b5f9d2
2017-10-04 21:54:11 +00:00
Steven Moreland
9a17f41f6f Merge "Update for hidl adapter module defaults." am: 988c977079 am: 861651985f
am: b53e6ad535

Change-Id: I23269fb7a9bdd352e670a80f390527d9eef31412
2017-10-04 21:51:00 +00:00
Steven Moreland
861651985f Merge "Update for hidl adapter module defaults."
am: 988c977079

Change-Id: I289818be1b30397391847ba1c532d1014fdbed27
2017-10-04 21:45:09 +00:00
Steven Moreland
527fd76a0e Update for hidl adapter module defaults.
Test: pass
Change-Id: Idc6a943149a279bf17cfcfd0f2571473e53bbbbf
2017-10-04 12:47:03 -07:00
Eino-Ville Talvala
da67f485d1 Camera: Update VTS for new camera@3.3 interfaces am: e224f065b8
am: 6e7079328f

Change-Id: Ic41a248e723a35071b75d58317c9c481d26508e1
2017-10-03 19:40:37 +00:00
Emilian Peev
56cf04f628 Camera: Enable VTS tests for 3.3 camera devices am: 5eb1aa3f2b
am: 316ef90e24

Change-Id: I4e4178744c719e334d9d488b7224987b7a4f8fdc
2017-10-03 19:39:27 +00:00
Eino-Ville Talvala
6e7079328f Camera: Update VTS for new camera@3.3 interfaces
am: e224f065b8

Change-Id: I9f2f442528306cc53eef23901cb65e9c8029855d
2017-10-03 19:23:03 +00:00
Emilian Peev
316ef90e24 Camera: Enable VTS tests for 3.3 camera devices
am: 5eb1aa3f2b

Change-Id: I7094bc338c603265a25dcc19831f9cb931cd30e1
2017-10-03 19:22:58 +00:00
Eino-Ville Talvala
e224f065b8 Camera: Update VTS for new camera@3.3 interfaces
- Cross check device version in name with ICameraDeviceSession version
- Switch all calls to configureStreams to configureStreams_3_3 when
  a v3.3 ICameraDeviceSession is available

Test: Test passes on v3.3 devices, doesn't regress on v3.2
Bug: 62358514
Change-Id: I7450e5d5119c5ec1fe9f1360bfc99fc8a47d0936
2017-10-02 12:35:32 -07:00
Emilian Peev
5eb1aa3f2b Camera: Enable VTS tests for 3.3 camera devices
A new 3.3 Camera device API is available and devices supporting it
need to be tested as well.

Bug: 67028051
Test: run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --primary-abi-only --module
VtsHalCameraProviderV2_4Target -l INFO

For passthrough devices: run commandAndExit vts
--skip-all-system-status-check --skip-preconditions --abi armeabi-v7a
--module VtsHalCameraProviderV2_4Target -l INFO

Change-Id: I91adb3c1867cdd8f8f810a2bd5b0a8ba2b0c1fcf
2017-10-02 11:02:16 -07:00
Steven Moreland
21e87ff129 Update makefiles for transitive interfaces.
am: fe46a35243

Change-Id: I4cbfc3fdf2889cde31784b819ae984ae301da5bd
2017-09-27 22:02:23 +00:00
Steven Moreland
3788a7321f Update makefiles for hidl-adapter (2/2).
Bug: 37518178
Test: none
Change-Id: I77fe67964f89da8b66aeb8df6d424de0f8689f8d
2017-09-27 08:55:47 -07:00
Steven Moreland
fe46a35243 Update makefiles for transitive interfaces.
Transitive includes accidentally added by hidl-gen
were getting added to import lists. This import isn't
actually required and is now properly excluded from
hidl-gen update makefiles.

Bug: 65055216
Test: none
Change-Id: I4fb4de8ef5547a3081cd55b3c75f6288cc518ba6
2017-09-26 18:00:30 -07:00
Steven Moreland
91799c6cc7 Merge "Fix typo in update makefiles." am: 9960148420 am: f07e364ce3 am: 71a193a425
am: 9fdd241905

Change-Id: I1c852fa6600fecc44d5afd1a65a5f51c43ecf71c
2017-09-27 00:02:52 +00:00
Steven Moreland
9fdd241905 Merge "Fix typo in update makefiles." am: 9960148420 am: f07e364ce3
am: 71a193a425

Change-Id: I45ae43f07323254212532acbf0f891d11143b05f
2017-09-26 23:58:51 +00:00
Steven Moreland
f07e364ce3 Merge "Fix typo in update makefiles."
am: 9960148420

Change-Id: I949634e72f817f3a5411130e968acd8efd1d7725
2017-09-26 23:51:07 +00:00
Steven Moreland
a5299ee739 Fix typo in update makefiles.
Bug: 37518178
Test: pass
Change-Id: Ic401b3a473f15ca4c01e58b3072e19db7c31b653
2017-09-26 21:59:43 +00:00
Steven Moreland
7741c0e17b Update makefiles for hidl adapter. am: 26a0bb2762 am: 73949c1d7e am: b94d0c7290
am: 97228c0b7d

Change-Id: Ic4b459b7c1a4325453945b0b00db8f44e4e77c26
2017-09-26 13:36:09 +00:00
Steven Moreland
97228c0b7d Update makefiles for hidl adapter. am: 26a0bb2762 am: 73949c1d7e
am: b94d0c7290

Change-Id: If766cffbcc003cc0cc5eb98969b924aa918fff44
2017-09-26 12:53:13 +00:00
Steven Moreland
73949c1d7e Update makefiles for hidl adapter.
am: 26a0bb2762

Change-Id: I3a811f5cd49bd4e81e8fcd5c8e88922115812539
2017-09-25 23:14:44 +00:00
Steven Moreland
26a0bb2762 Update makefiles for hidl adapter.
Bug: 37518178
Test: manual
Change-Id: I50e999907d3c64d2b039272b823971998da64d1b
2017-09-25 18:35:56 +00:00
Eino-Ville Talvala
7fccf50db2 Merge "Camera: Add default implementation of camera.device@3.3" into oc-mr1-dev am: 3f55d8735e
am: d69e27a115

Change-Id: If3fe372f0574c318fb194dcab0ea2cee4fc827ff
2017-09-19 16:01:04 +00:00
Eino-Ville Talvala
d69e27a115 Merge "Camera: Add default implementation of camera.device@3.3" into oc-mr1-dev
am: 3f55d8735e

Change-Id: Ib621684a43181bfbf8fdf020128215d326fc4fbd
2017-09-19 15:57:03 +00:00
Eino-Ville Talvala
3f55d8735e Merge "Camera: Add default implementation of camera.device@3.3" into oc-mr1-dev 2017-09-19 15:53:43 +00:00
Eino-Ville Talvala
50fe430994 Camera: Add default implementation of camera.device@3.3
Inherit as much as possible from camera.device@3.2

- Refactor CameraDeviceSession@3.2 implementation to separate out the
  HIDL session interface from the main implementation object. This
  avoids multiple inheritance issues
- Create CameraDeviceSession@3.3 with support for the new
  overrideDataspace field
- Add virtual factory method for CameraDevice to create the right version
  of Session.
- Create CameraDevice@3.3, which overrides createSession to return a
  CameraDeviceSession@3.3.
- Add system property to override selection of which minor HIDL
  version is used for legal HAL version 3.x; set the default to the
  newest available minor version.

Test: Camera CTS passes on device using @3.3.
Bug: 62358514
Change-Id: I497e4bc0de798b56ecdb2ea6467b79afccaf89f7
2017-09-15 11:08:48 -07:00
Yin-Chia Yeh
56a8fc8807 Merge "Camera: synchronize access to mMemoryMap" into oc-mr1-dev am: e79124c62b
am: 5df4db2e87

Change-Id: I17d8daf2c7d51cfe541d1b2364baa2cf2029340c
2017-09-15 09:20:33 +00:00
Yin-Chia Yeh
623ddbb528 Merge "Camera: synchronize access to mMemoryMap"
am: 2b888b349f

Change-Id: If68840c461ce96a8ff3749ae3d6628e9f548505d
2017-09-14 22:02:48 +00:00
Yin-Chia Yeh
5df4db2e87 Merge "Camera: synchronize access to mMemoryMap" into oc-mr1-dev
am: e79124c62b

Change-Id: I351da89fa72d626b2ec2ea580637ea531fa3010b
2017-09-14 21:54:51 +00:00
Yin-Chia Yeh
308f5b6e15 Camera: synchronize access to mMemoryMap
Test: stress test on partner device
Bug: 64831570
Change-Id: Ib9ece2f876ccb309c4f1bb8f90242a3e91081f47
Merged-In: Ib9ece2f876ccb309c4f1bb8f90242a3e91081f47
2017-09-14 12:18:05 -07:00
Yin-Chia Yeh
6550022dba Camera: synchronize access to mMemoryMap
Test: stress test on partner device
Bug: 64831570
Change-Id: Ib9ece2f876ccb309c4f1bb8f90242a3e91081f47
2017-09-12 16:35:29 -07:00
Jaekyun Seok
81104ae5ef Add 'vendor.' prefix to a vendor HAL service name
To prevent property name collisions between properties of system and
vendor, 'vendor.' prefix must be added to a vendor HAL service name.
You can see the details in http://go/treble-sysprop-compatibility.

Test: succeeded building and tested on a walleye device
Bug: 36796459
Change-Id: I4e8fbee791ec917a8f627a1366f4d44ec7e6febc
2017-09-12 08:01:42 +09:00
Martijn Coenen
567cbf1148 Make camera/drm helper classes available to system.
As VTS tests are considered system and link against these.

Bug: 38302533
Bug: 62523241
Test: builds
Change-Id: Iac5c872c58ec9646d6d6974aacceb930daad7e5e
2017-09-06 10:45:14 -07:00
Zhuoyao Zhang
4cf8cc0348 Merge "Update vts test to use the updated test template." into oc-mr1-dev
am: 69270ce30f

Change-Id: I6c34ee4d363c3d485abc8e71d938c1e3a98e6f51
2017-08-30 22:19:55 +00:00
Zhuoyao Zhang
6afb992759 Update vts test to use the updated test template.
* For registerTestService/getServiceName, no need to pass
  any hard coded string of HAL service FQName.
* Affect test: VtsHalCameraProviderV2_4TargetTest,
               VtsHalGraphicsComposerV2_1TargetTest,
               VtsHalNeuralnetworksV1_0TargetTest

Bug: 62946472
Bug: 64203181

Test: make vts
      vts-tradefed run vts -m VtsHalCameraProviderV2_4Target

Merged-In: If365ab2ed9a91eb4013d71769804b9d4bf089d66
Change-Id: Id0bddbc2949337147557f45cc60dbfaa114ce25e
(cherry picked from commit d71b654d6d)
2017-08-29 17:44:10 +00:00
Zhuoyao Zhang
a983b8fe62 Revert "Revert "Update vts test to use the updated test template.""
This reverts commit 43d7498d52.

Change-Id: If365ab2ed9a91eb4013d71769804b9d4bf089d66
2017-08-29 17:25:46 +00:00
Tony Mak
43d7498d52 Revert "Update vts test to use the updated test template."
This reverts commit d71b654d6d.

Reason for revert: It breaks some targets in master
                   Example error: https://android-build.googleplex.com/builds/submitted/4303994/sailfish-userdebug_fastbuild3_linux/latest/view/logs/build_error.log

Change-Id: I63a90318bde8869972a8fc4b9a2cc36db26037f5
2017-08-29 10:14:32 +00:00
Zhuoyao Zhang
d71b654d6d Update vts test to use the updated test template.
* For registerTestService/getServiceName, no need to pass
  any hard coded string of HAL service FQName.
* Affect test: VtsHalCameraProviderV2_4TargetTest,
               VtsHalGraphicsComposerV2_1TargetTest,
               VtsHalNeuralnetworksV1_0TargetTest

Bug: 62946472
Bug: 64203181

Test: make vts
      vts-tradefed run vts -m VtsHalCameraProviderV2_4Target

Change-Id: Id0bddbc2949337147557f45cc60dbfaa114ce25e
2017-08-28 18:45:12 +00:00
Eino-Ville Talvala
cba87937e9 Merge "Camera: Add new minor revision camera.device@3.3" into oc-mr1-dev
am: a2c5f9365c

Change-Id: I30c3252db3b202377f37ddc480b45ae172e28c87
2017-08-24 18:38:39 +00:00
Eino-Ville Talvala
d09e5651ed Camera: Add new minor revision camera.device@3.3
This adds a single new member to the HalStream structure, used by
camera.device@3.2::ICameraDeviceSession.configureStreams, for
HALs to override the requested stream dataSpace.

This override may be used when the requested format is
IMPLEMENTATION_DEFINED.

Test: Builds
Bug: 62358514
Change-Id: Ie43e6cfd2ac52657c9366ff5297daa22c0bfa46c
2017-08-23 11:31:40 -07:00
Tri Vo
17962db268 Merge "Camera test statically links to dependencies." into oc-mr1-dev
am: 1f789fc39c

Change-Id: Ie35ffcc8fa8ba403d7805765d2d4d19a924211bd
2017-08-21 18:43:27 +00:00
TreeHugger Robot
1f789fc39c Merge "Camera test statically links to dependencies." into oc-mr1-dev 2017-08-21 18:34:31 +00:00
Emilian Peev
d20434bfac Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-mr1-dev
am: fc371311ad

Change-Id: If8cb5a802d75353e116b4debd3a4b7f304fd8eea
2017-08-15 22:31:44 +00:00
Emilian Peev
fe8f3a8e89 Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dev am: e2dae8c258
am: 4fa40be5ef

Change-Id: I9a628c55a78651550f663b28eb2ddff0c08cde25
2017-08-15 20:33:44 +00:00
Emilian Peev
4fa40be5ef Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dev
am: e2dae8c258

Change-Id: If093cdfdb9ea0a327a5e67dc0dd40facc466de5c
2017-08-15 20:27:50 +00:00
Emilian Peev
e2ecbe00f0 Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'
Calls to 'cancelPicture' should be no-ops in case image capture
is not active.

Bug: 64569316
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --primary-abi-only --module
VtsHalCameraProviderV2_4Target -l INFO
Change-Id: I5fad0a5b7aafd208c3a1b2f62a2b9046cde858d1
2017-08-15 18:22:08 +00:00
Steven Moreland
f5da927e19 Updating all makefiles.
am: dfd8287506

Change-Id: I915b69ab3a46f25b9abeb525066d6ea89d162176
2017-08-14 21:05:52 +00:00
Steven Moreland
dfd8287506 Updating all makefiles.
Bug: 64487114
Test: none
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Merged-In: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0
Merged-In: Ifdc3c17cb2b85c18b37dac2d03bb5c8935c23180
Change-Id: I170fa1c4fe39f8109b1670db58ef99bb11afc0be
2017-08-14 20:25:09 +00:00
Steven Moreland
4f25c2a143 Revert "Revert "Updating all makefiles.""
Relanding without automotive/vehicle/2.0+2.1 changes.

This reverts commit 1020ebedfb.

Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Change-Id: Icc49df42c2bedf443d878d5d8fbaa53441ea65db
2017-08-11 23:02:01 +00:00
Steven Moreland
ff308ea6ba Updating all makefiles.
Bug: 64487114
Test: none
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Merged-In: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0
Change-Id: Ifdc3c17cb2b85c18b37dac2d03bb5c8935c23180
2017-08-11 22:58:47 +00:00
Steven Moreland
1020ebedfb Revert "Updating all makefiles."
This reverts commit 8ac1971678.

Reason for revert: Didn't remove automotive changes from this CL.

Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Change-Id: I1c660cffc8817ad0b33da9f6eceb3d88e7c48416
2017-08-11 22:56:56 +00:00
Emilian Peev
be959695e3 Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'
Calls to 'cancelPicture' should be no-ops in case image capture
is not active.

Merged-In: I5fad0a5b7aafd208c3a1b2f62a2b9046cde858d1
Bug: 64569316
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --primary-abi-only --module
VtsHalCameraProviderV2_4Target -l INFO

Change-Id: I5fad0a5b7aafd208c3a1b2f62a2b9046cde858d1
2017-08-11 10:42:05 +01:00
Steven Moreland
8ac1971678 Updating all makefiles.
Bug: 64487114
Test: none
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Change-Id: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0
2017-08-10 22:40:04 +00:00
Tri Vo
7a998e53bc Camera test statically links to dependencies.
This test now statically links to HAL def libs which
are not guaranteed to be on the device.

Bug: 64040096
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target
Change-Id: Ib33fdfd45b10840cce363fcda291a62e56b1d4c8
2017-08-07 16:29:28 -07:00
Justin Yun
608d773ef8 Update make file for vndk enabled.
Update the Android.bp generated with hidl-gen.

Test: build with and without BOARD_VNDK_VERSION=current
Bug: 63866913
Change-Id: I1a9db1df49e0f13c5790da2b118ae9ec63ba34a7
2017-08-04 14:12:23 +09:00
Tri Vo
f5d136c231 Update Android.bp HIDL makefiles
Allow HAL definition libs to be static.

Bug: 32920003
Bug: 64040096
Test: update-all-google-makefiles.sh
Change-Id: I1483d572bea6799717d1614fb7d52fe225e31104
2017-08-03 00:30:01 +00:00
Yin-Chia Yeh
e31ea3ab65 Merge "Camera: reset callback after test done" into oc-dev
am: 72ff9a1e38

Change-Id: I194688afcf1143f7ac40416150986cd8e4ad02aa
2017-08-01 22:05:24 +00:00
TreeHugger Robot
72ff9a1e38 Merge "Camera: reset callback after test done" into oc-dev 2017-08-01 21:40:35 +00:00
Emilian Peev
39e2d42dcb Merge "NO PARTIAL RERUN Camera: Update stream consumer usage flag" into oc-dev
am: 456dc6cc86

Change-Id: I2101aa5931f85f78f19e35922bdecfabd4687c65
2017-07-31 16:28:17 +00:00
TreeHugger Robot
456dc6cc86 Merge "NO PARTIAL RERUN Camera: Update stream consumer usage flag" into oc-dev 2017-07-31 16:22:23 +00:00
TreeHugger Robot
48e25765d1 Merge "Camera: Update stream consumer usage flag" into oc-dr1-dev 2017-07-31 16:21:44 +00:00
Yin-Chia Yeh
d42258ea80 Camera: fix various VTS issues
am: a0dd95d45d

Change-Id: I1fe7b8e4e17af70776f197ea25ecdd4281c34e5c
2017-07-31 08:55:46 +00:00
Emilian Peev
d9a7d3cd95 NO PARTIAL RERUN Camera: Update stream consumer usage flag
It is possible that the current default consumer usage
flag may not be supported by some provider implementations.
Use either HW composer or some other flag that is appropriate
for the specific use case.

Merged-In: I04f89bf67166805191d6d40e5bd93c15ebc97ea6
Bug: 63913159
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --primary-abi-only --module
VtsHalCameraProviderV2_4Target -l INFO

Change-Id: I04f89bf67166805191d6d40e5bd93c15ebc97ea6
2017-07-31 09:36:56 +01:00
Yin-Chia Yeh
a0dd95d45d Camera: fix various VTS issues
Also fix wrong return values for processCaptureRequest in default
wrapper.

Test: running camera VTS
Bug: 64041692
Change-Id: I397390af7c85a776713f6287bef1c4d11c721c9a
Merged-In: I397390af7c85a776713f6287bef1c4d11c721c9a
2017-07-28 13:22:42 -07:00
Emilian Peev
bba0a5498a Camera: Update stream consumer usage flag
It is possible that the current default consumer usage
flag may not be supported by some provider implementations.
Use either HW composer or some other flag that is appropriate
for the specific use case.

Bug: 63913159
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --primary-abi-only --module
VtsHalCameraProviderV2_4Target -l INFO

Change-Id: I04f89bf67166805191d6d40e5bd93c15ebc97ea6
2017-07-28 10:07:50 +01:00
Yin-Chia Yeh
5311547c05 Merge "Camera: fix various VTS issues" into oc-dr1-dev 2017-07-27 23:08:56 +00:00
Yin-Chia Yeh
d17bb31a0d Merge "Camera: reset callback after test done" into oc-mr1-dev 2017-07-27 22:09:12 +00:00
TreeHugger Robot
34c5caaa9f Merge "Camera: fix various VTS issues" into oc-mr1-dev 2017-07-27 22:04:59 +00:00
Yin-Chia Yeh
fafbc479db Camera: fix various VTS issues
Also fix wrong return values for processCaptureRequest in default
wrapper.

Test: running camera VTS
Bug: 64041692
Change-Id: I397390af7c85a776713f6287bef1c4d11c721c9a
Merged-In: I397390af7c85a776713f6287bef1c4d11c721c9a
2017-07-27 18:45:30 +00:00
Yin-Chia Yeh
e9ab8227ae Camera: fix various VTS issues
Also fix wrong return values for processCaptureRequest in default
wrapper.

Test: running camera VTS
Bug: 64041692
Change-Id: I397390af7c85a776713f6287bef1c4d11c721c9a
2017-07-27 11:43:24 -07:00
Yin-Chia Yeh
feb0ddde26 Camera: add camera owners
Test: none
Change-Id: I1a221feea480139d78c9b10dcd6c7c88955901bd
Merged-In: I1a221feea480139d78c9b10dcd6c7c88955901bd
(cherry picked from commit 14a5810a2e)
2017-07-27 18:21:51 +00:00
Yin-Chia Yeh
557cce559a Camera: reset callback after test done
Back port from master

Test: VTS test pass
Bug: 63570734
Change-Id: Ic0eecaf843b5c2e78f60325090ea652d43a74a0b
Merged-In: Ic0eecaf843b5c2e78f60325090ea652d43a74a0b
2017-07-26 17:13:30 -07:00
TreeHugger Robot
eba1407b55 Merge "Camera: reset callback after test done" into oc-dr1-dev 2017-07-26 21:28:45 +00:00
Emilian Peev
7596b25bf9 Camera: Update stream consumer usage flag
It is possible that the current default consumer usage
flag may not be supported by some provider implementations.
Use either HW composer or some other flag that is appropriate
for the specific use case.

Merged-In: I04f89bf67166805191d6d40e5bd93c15ebc97ea6
Bug: 63913159
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --primary-abi-only --module
VtsHalCameraProviderV2_4Target -l INFO

Change-Id: I04f89bf67166805191d6d40e5bd93c15ebc97ea6
2017-07-26 11:15:38 +01:00
Eino-Ville Talvala
4c652d5639 Merge "Camera: Don't enforce result metadata queue support" into oc-dev
am: 1d1b503b77

Change-Id: I701fc97cde2dab420b84a7c9ba0afaa36a91754e
2017-07-25 21:09:04 +00:00
Emilian Peev
bec2968e51 Camera: Don't enforce result metadata queue support
Some provider implementations could still be using direct
transfer of the result metadata through hw binder.

Merged-In: Ib2adaff005af77385767a32c1ed069371a6e9b7a
Bug: 63970723
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO
Change-Id: Ib2adaff005af77385767a32c1ed069371a6e9b7a
2017-07-25 18:06:58 +01:00
Emilian Peev
3b740fa689 Camera: Don't enforce result metadata queue support
Some provider implementations could still be using direct
transfer of the result metadata through hw binder.

Bug: 63970723
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO
Change-Id: Ib2adaff005af77385767a32c1ed069371a6e9b7a
2017-07-25 15:09:41 +01:00
Emilian Peev
fa3a98bb28 Camera: Don't enforce result metadata queue support
Some provider implementations could still be using direct
transfer of the result metadata through hw binder.

Merged-In: Ib2adaff005af77385767a32c1ed069371a6e9b7a
Bug: 63970723
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO
Change-Id: Ib2adaff005af77385767a32c1ed069371a6e9b7a
2017-07-25 15:06:06 +01:00
Yin-Chia Yeh
83f4904d51 Camera: reset callback after test done
Test: VTS test pass
Bug: 63570734
Change-Id: Ia7b1e8e9baae2885d9c43821fe2933df883f7892
Merged-In: Ic0eecaf843b5c2e78f60325090ea652d43a74a0b
2017-07-20 12:05:21 -07:00
Zhuoyao Zhang
6e87e4c864 Update VtsHalCameraProviderV2_4TargetTest
* Use VtsHalHidlTargetTestEnvBase to run test against different service name

Bug:62946472
Test: make vts
      vts-tradefed run vts -m VtsHalCameraProviderV2_4Target

Change-Id: I12edce57c237cb6674e0aff437c3389e5ad9e028
2017-07-14 16:48:52 -07:00
Yin-Chia Yeh
719d3fceb3 Camera: reset callback after test done
Test: VTS test pass
Bug: 63570734
Change-Id: Ia7b1e8e9baae2885d9c43821fe2933df883f7892
Merged-In: Ia7b1e8e9baae2885d9c43821fe2933df883f7892
2017-07-11 23:46:16 +00:00
Jiyong Park
ec648686db Build camera.device@1.0-impl with BOARD_VNDK_VERSION
Add the dependency to media_plugin_headers since global include path is
not provided when building with BOARD_VNDK_VERSION

Bug: 37342627
Test: BOARD_VNDK_VERSION=current m -j camera.device@1.0-impl.vendor

(cherry picked from commit ef25b10aeb5134046c9acc3fbddbda1783fd32f0)

Change-Id: I506ad4d70b708d129cdc7842cc772c20d9b4197b
2017-07-10 12:37:00 +09:00
Emilian Peev
2fe705b726 Merge "Camera: Try adding a passthrough legacy service" into oc-dr1-dev am: efe973102a
am: 3518e360ca

Change-Id: I52e70a41a8e74f6cbb7ec4be041417da6089d2a2
2017-06-30 18:14:01 +00:00
Emilian Peev
48a0992dd4 Camera: Try adding a passthrough legacy service
Listing by interface on passthrough only devices doesn't
return the legacy implementation that might be present.
For this case try to connect to the legacy provider and
check whether such implementation does in fact exist.

Bug: 62835396
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO

Change-Id: Ifdc1b15392f5418fd0d949953bb6bdb1f3612ee8
2017-06-30 08:19:19 -07:00
Emilian Peev
e6522390bb Camera: Try to test additional types of camera providers NO PARTIAL RERUN
Check whether different types of camera providers got
registered and try to test them if present.

Merged-In: I5c0c678e74d56cd8307d2f4e63b7c6dfa95d210d
Bug: 62835396
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO
Change-Id: I5c0c678e74d56cd8307d2f4e63b7c6dfa95d210d
2017-06-29 16:21:44 -07:00
Emilian Peev
1af9528966 Camera: Try to test additional types of camera providers
Check whether different types of camera providers got
registered and try to test them if present.

Merged-In: I5c0c678e74d56cd8307d2f4e63b7c6dfa95d210d
Bug: 62835396
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO
Change-Id: I5c0c678e74d56cd8307d2f4e63b7c6dfa95d210d
2017-06-29 08:02:08 -07:00
Emilian Peev
ed0a5d2eba Merge "Camera: Add support for testing partial results" into oc-dev
am: 98b7dd57dc

Change-Id: If210f365f31053c718aee550d1a3e8d6432ff97b
2017-06-29 01:48:49 +00:00
TreeHugger Robot
98b7dd57dc Merge "Camera: Add support for testing partial results" into oc-dev 2017-06-29 01:46:13 +00:00
Emilian Peev
81ac4074fe Merge "Camera: Try to test additional types of camera providers" into oc-dr1-dev am: c68231d171
am: 6d600e571c

Change-Id: I22e29abfa964c0448b39987e92b0173c49d59a49
2017-06-28 16:51:59 +00:00
Yifan Hong
a04a913c77 Fix missing includes in camera.common
Test: mma -j BOARD_VNDK_VERSION=current
Bug: 33241851
Change-Id: I471f05cf66e4c8532c428f9894fa4642139e03e2
2017-06-27 11:34:02 -07:00
Emilian Peev
a37b73598b Camera: Try to test additional types of camera providers
Check whether different types of camera providers got
registered and try to test them if present.

Bug: 62835396
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO
Change-Id: I5c0c678e74d56cd8307d2f4e63b7c6dfa95d210d
2017-06-26 16:35:41 -07:00
Emilian Peev
74b543d565 Camera: Add support for testing partial results
Currently the result handling is very basic. Partial
results and inflight queues are not supported. More
elaborate test cases like burst or streaming will
require such functionality to be present.

Merged-In: I3769d4ccc0047dc4eda173ea3bca538b026be8d2
Bug: 62550376
Bug: 37533777
Test: adb shell
/data/nativetest/VtsHalCameraProviderV2_4TargetTest/VtsHalCameraProviderV2_4TargetTest

Change-Id: I3769d4ccc0047dc4eda173ea3bca538b026be8d2
2017-06-26 11:58:15 -07:00
TreeHugger Robot
c60ec1c2ac Merge "Camera: Add support for testing partial results" into oc-dr1-dev 2017-06-26 18:42:48 +00:00
Yahan Zhou
a61c24c091 Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev
am: eed6653f2a

Change-Id: Ia962664983096059da8ecbffa7f13ef525e4a6e4
2017-06-23 17:59:26 +00:00
Yahan Zhou
2ff1f7e687 Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev
am: eed6653f2a

Change-Id: I66f434944d2a00bee6c06d0883b916c5c87d1243
2017-06-23 17:59:25 +00:00
Yahan Zhou
77dd4aaad3 Camera: fix recursive lock in CameraDevice 1.0
Several functions call close() while they are holding a lock, which
results in recursive locking. This CL implements close_locked() to avoid
such behavior.

Bug: 62919192
Test: run vts -m VtsHalCameraProviderV2_4Target, and camera should still
work after it

Change-Id: Ib38e1de19ed3c927bfb645c0c777c04f157f2b88
2017-06-23 00:28:11 +00:00
Emilian Peev
9af635c564 Camera: Add support for testing partial results
Currently the result handling is very basic. Partial
results and inflight queues are not supported. More
elaborate test cases like burst or streaming will
require such functionality to be present.

Bug: 62550376
Bug: 37533777
Test: adb shell
/data/nativetest/VtsHalCameraProviderV2_4TargetTest/VtsHalCameraProviderV2_4TargetTest

Change-Id: I3769d4ccc0047dc4eda173ea3bca538b026be8d2
2017-06-21 15:00:12 +01:00
Martijn Coenen
14adc6ebc0 Make camera/drm helper classes available to system.
As VTS tests are considered system and link against these.

Bug: 38302533
Bug: 62523241
Test: builds
Change-Id: Iac5c872c58ec9646d6d6974aacceb930daad7e5e
2017-06-20 08:57:46 -07:00
TreeHugger Robot
e599e41a1e Merge "Move CameraParameters class to android.hardware.camera.common@1.0-helper" into oc-dr1-dev 2017-06-20 07:17:47 +00:00
Yin-Chia Yeh
1ea71cc4f2 Merge "Camera: fix camera_metadata address expectation" into oc-dev
am: e812feb56f

Change-Id: I9142f4bb7a55f9c1e6547a038b21f7cbb4e5adba
2017-06-16 19:40:12 +00:00
Yin-Chia Yeh
8bc10783a9 Merge "Camera: fix camera_metadata address expectation" into oc-dev
am: e812feb56f

Change-Id: Id3e433048cf25e8c50aa20e97dca6e3112f0fb57
2017-06-16 19:37:00 +00:00
Yin-Chia Yeh
92d885b558 Camera: fix camera_metadata address expectation
On 32bits architecture, binder driver might allocate
non-8 bytes aligned buffers.

Test: compile (problem not reproducible on 64bit SOCs)
Bug: 62637461
Change-Id: I8ef2b3ecba783a8d189ebe18733082d32cff4899
2017-06-15 14:27:13 -07:00
Jiyong Park
b9b59bdca4 Move CameraParameters class to android.hardware.camera.common@1.0-helper
The CameraParamters class is widely used by many of the camera-related
vendor libs. However, they have been using the class from the
libcamera_client.so which is not a VNDK library.

By moving the class to the common@1.0-helper, which is available to
vendors, we can eliminate the dependency to libcamera_client.so from the
vendor libs.

Bug: 62523241
Test: 2016/2017 Pixel devices build and boots. Camera functionalities
work.

Change-Id: I3f69f1591663390c050d1e75ac2957d3ecc38ba7
2017-06-12 22:45:10 +09:00
Chih-Hung Hsieh
d3bc681f26 Remove unused lambda capture
New clang compiler gives warning to unused lambda captures.
Apply clang-format.

Bug: 37423073
Test: Build

Change-Id: Icdf019df1a6c9dcadeb35551377d7afa09eebb3e
(cherry picked from commit 7eb57b60ab)
2017-06-07 12:57:20 -07:00
Yin-Chia Yeh
2912d05274 Merge "Camera: fix release fence FD leaks" into oc-dev am: 6e7ca4e166
am: a9576758e2

Change-Id: I3fe086caa15f5ab3fd065cba312b6693f8da828d
2017-05-30 22:47:14 +00:00
Yin-Chia Yeh
a9576758e2 Merge "Camera: fix release fence FD leaks" into oc-dev
am: 6e7ca4e166

Change-Id: I82df851760e0d85890fcc85496afb302f38d3ed7
2017-05-30 22:39:03 +00:00
Yin-Chia Yeh
aa6993121e Camera: fix release fence FD leaks
Test: use sw_sync to fake release fence FDs, GCA, CTS
Bug: 62070085
Change-Id: Iae77a2e112df5363e55e4177656a5dd41b830cbd
2017-05-26 16:28:45 -07:00
TreeHugger Robot
0c2a8f7d73 Merge "Camera: Remove binderized todo comment" 2017-05-26 15:23:25 +00:00
Shuzhen Wang
32f0b047dc Camera: Silence log spam am: 207867716a
am: 6ccc129e91

Change-Id: Ida70914135764b034aff9c09b288df5a31cb9c60
2017-05-25 23:16:58 +00:00
Shuzhen Wang
6ccc129e91 Camera: Silence log spam
am: 207867716a

Change-Id: I697d551878713f56ed5845b3ebd87db76e1b513e
2017-05-25 22:57:13 +00:00
Shuzhen Wang
207867716a Camera: Silence log spam
HAL is allowed to return captureResult from different thread contexts.
Do not do ALOGW if this is the case.

Test: Run camera and check logspam is gone
Bug: 62068207
Change-Id: I86e77fc578953cefecf10ebc4d395edf33627e8c
2017-05-25 11:21:09 -07:00
Eino-Ville Talvala
5f8d14e07d Merge "camera.device@3.2 wrapper: Close release fence FDs" into oc-dev am: 1c20927f43
am: 86d314012e

Change-Id: Ic036732ddbd750d47915e3f033d1384499ccea6b
2017-05-25 01:58:54 +00:00
Eino-Ville Talvala
86d314012e Merge "camera.device@3.2 wrapper: Close release fence FDs" into oc-dev
am: 1c20927f43

Change-Id: I81840052731f509509cde33ba773b5972ed08d66
2017-05-25 01:55:55 +00:00