Commit Graph

2330 Commits

Author SHA1 Message Date
Shuzhen Wang
2899ed6fda Merge "Camera2: Legacy: Add onRequestQueueEmpty callback" into oc-mr1-dev am: 4dde010145
am: 7ff3038385

Change-Id: I58077003219ed03ba08e5aab1475f2d46219825f
2017-08-12 00:29:10 +00:00
Sheng-Hao Tsao
b6109a64e2 Merge "Fix a bug that SurfaceView loses transformation" into oc-mr1-dev am: e22ecbdd61
am: 8bb38b555b

Change-Id: I700178674fa12d088bdf2b1bb67ea1f12fb33b53
2017-08-12 00:08:10 +00:00
TreeHugger Robot
4dde010145 Merge "Camera2: Legacy: Add onRequestQueueEmpty callback" into oc-mr1-dev 2017-08-11 22:47:53 +00:00
TreeHugger Robot
e22ecbdd61 Merge "Fix a bug that SurfaceView loses transformation" into oc-mr1-dev 2017-08-11 21:49:22 +00:00
Yin-Chia Yeh
542edd6dcf Merge "Camera: fix legacy device CTS failure" into oc-mr1-dev am: 0cfad57566
am: df7d855072

Change-Id: I945d6ef3bad30a96c1ff1457b793bf5270e6950e
2017-08-11 20:03:53 +00:00
Sheng-Hao Tsao
bb39c858c7 Fix a bug that SurfaceView loses transformation
SurfaceView created for on-screen preview sometimes loses
transformation information in the Camera2 API with HALv1
environment, and therefore produced wrongly transformed frames.

It's because in RequestThreadManager.configureOutputs(), the
transformation set by LegacyCameraDevice.setSurfaceOrientation()
is cleared at mGLThreadManager.setConfigurationAndWait().

The bug is fixed by setting transformation information again
after mGLThreadManager.setConfigurationAndWait().

BUG=63313861
TEST=Check on minnie with GCA and CameraIQTesting app. Preview always
displays correct transformation in Camera2<=>HALv1 environment.

Change-Id: Ic395047a120a21b3968dedb4314bdbe519c932e6
2017-08-11 16:54:20 +00:00
Shuzhen Wang
234ba3ef75 Camera2: Legacy: Add onRequestQueueEmpty callback
onRequestQueueEmpty callback needs to be supported for legacy HAL1
devices.

Test: Camera CTS
Bug: 64483624
Change-Id: I268a1fe7577788c4e4e13dfecd7bb7abe0d82e6c
2017-08-11 09:32:20 -07:00
Yin-Chia Yeh
daf20731ca Camera: fix legacy device CTS failure
Bug: 64259581
Test: emulator CTS failure is fixed
Change-Id: I9988ffb7877c3f5d62c82ab3c7b8744720824fba
2017-08-10 22:44:50 +00:00
Peng Xu
63bf36a211 Update GeomagneticField parameters according to WMM-2015
Test: compiles and corresponding cts test pass
Bug: 31216311
Change-Id: I36f26086b1e2f62f81974d81d90c9a9c315a3445
2017-08-09 21:14:37 -07:00
Kevin Chyn
76b71c0580 Update FINGERPRINT_ERROR_LOCKOUT documentation
Fixes: 64330785

Test: make -j56
Change-Id: I40f0e71b9fd7dcdd12340bc03bb077e56813f5b7
2017-08-08 12:00:08 -07:00
Tomasz Wasilczyk
d2b5cfbdaa Change VENDOR program types to range.
Bug: b/64331420
Test: instrumentation
Change-Id: If5c56f09e2b9e272a40f0ca074a590ca6ec3a703
2017-08-07 10:20:24 -07:00
TreeHugger Robot
b79eb54d36 Merge "Fix broken javadocs." into oc-mr1-dev 2017-08-06 16:28:58 +00:00
Jeff Sharkey
67f9d5070a Fix broken javadocs.
Bug: 64337634
Test: make -j32 doc-comment-check-docs
Change-Id: I20fdd3dcddef09111d35946c41c596c7689effa6
2017-08-06 07:37:08 -06:00
Tomasz Wasilczyk
162d14a1ea Pass ProgramInfo over currentProgramInfoChanged and drop afSwitch_1_1.
Bug: b/64229617
Test: instrumentation
Change-Id: Ib4b20a6ebdd05a51f1a30447ccc3c2357df2a35d
2017-08-04 15:22:52 -07:00
Tomasz Wasilczyk
0f1776d08b Pass vendor-specific info as map.
This solves a problem of identifying, if a given application is talking
to a hardware that can handle format of these strings.

Bug: b/64229617
Test: VTS, instrumentation
Change-Id: I6f525be90105bfdc01a899feea2a3151719ec8d2
2017-08-03 18:21:22 -07:00
Tomasz Wasilczyk
36ea87b075 Merge "Address Broadcast Radio HAL review notes." into oc-mr1-dev 2017-08-03 16:52:31 +00:00
Chien-Yu Chen
cd1cb83314 Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89
am: 615f9e1277

Change-Id: I9ea51423e88f90648f480c55d4567db6cee6ef98
2017-08-02 22:58:15 +00:00
Chien-Yu Chen
615f9e1277 Merge "camera2: Fix template requirements" into oc-dev
am: 2976109d89

Change-Id: I20b68b33caf48afeead56116602c6a9b2a33ab26
2017-08-02 19:56:55 +00:00
Tomasz Wasilczyk
8316291cda Address Broadcast Radio HAL review notes.
Bug: b/64229617
Test: instrumentation
Change-Id: I4325c7b2cef030ce900d23af9468591c2fc1a19e
2017-08-01 10:52:58 -07:00
Tomasz Wasilczyk
f299ab10e7 Merge "Add permission annotation to RadioManager methods." into oc-mr1-dev 2017-08-01 17:43:02 +00:00
Eino-Ville Talvala
102e9a7e3b Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev
am: 06802167e5

Change-Id: Iedafc28d1a63b708b1992e4ef3570069c59d087a
2017-07-31 22:30:01 +00:00
Eino-Ville Talvala
3b594bfe33 Camera2: Release input surface on capture session close
Per the documentation, the input surface of a reprocessable capture
session should be abandoned on the close of a session.

Actually implement this, to avoid unintentional leaks of buffers.

Test: Camera CTS passes
Bug: 38313948
Change-Id: Ia45c39ea925288a5082d6e722ff4b40c55971a37
2017-07-31 10:09:59 -07:00
Chien-Yu Chen
5b0a58ea45 camera2: Fix template requirements
STILL_CAPTURE, RECORD, and VIDEO_SNAPSHOT templates are not
guaranteed on depth only devices.

Test: make docs
Bug: 64157646
Change-Id: I1b2db9d919e136d640be0ca04f63b71e4603e542
2017-07-28 15:15:39 -07:00
Tomasz Wasilczyk
749e3dc6cf Add permission annotation to RadioManager methods.
This is annotation only change.

Bug: b/62343415
Test: instrumentalization
Change-Id: Ib8b76d8b8baf4c3393df1307e531c1350b9fb13e
2017-07-28 13:20:41 -07:00
Andrii Kulian
d313469e28 DO NOT MERGE VirtualDisplay wrapper with input forwarding
New version of ActivityView that doesn't use expensive
ActivityContainer, but utilizes VirtualDisplays instead.

Creation of this view is only allowed for callers who have
android.Manifest.permission.INJECT_EVENTS permission.

Launching activities into this container is restricted by
the same rules that apply to launching on VirtualDisplays:
- Owner is allowed to launch its own activities.
- If activity that's being launched is not from the same
  app, then it must be embeddable and launcher must have
  permission to embed.

Bug: 63338670
Test: go/wm-smoke
Change-Id: Id9a25752367ebe8e59d2fc21c5d9de5cf597ea01
2017-07-21 13:14:37 -07:00
TreeHugger Robot
5a1f7ff0fe Merge "Rename vendorExtension fields to vendorInfo." 2017-07-20 03:42:13 +00:00
Tomasz Wasilczyk
f3bbae7d6e Merge "Rename (FM) Radio to Broadcast Radio to avoid confusion with (GSM) Radio." 2017-07-20 01:38:51 +00:00
TreeHugger Robot
339665ff58 Merge "Update FINGERPRINT_ERROR_VENDOR documentation" 2017-07-20 00:04:03 +00:00
Tomasz Wasilczyk
ac3bd38735 Rename vendorExtension fields to vendorInfo.
Bug: b/63634552
Test: instrumentation
Change-Id: Ic552f41dfd5be57fcbc64690358b14070b7efa60
2017-07-19 16:26:46 -07:00
Tomasz Wasilczyk
6b4b646d9c Rename (FM) Radio to Broadcast Radio to avoid confusion with (GSM) Radio.
Bug: b/63405337
Test: instrumentation

Change-Id: I33c3e450602e521b77b6167f9866278980f17743
2017-07-19 16:26:46 -07:00
Tomasz Wasilczyk
6e29269461 Merge "Implement out-of-band metadata images." 2017-07-19 23:20:26 +00:00
Kevin Chyn
5bd5011b4f Update FINGERPRINT_ERROR_VENDOR documentation
Fixes: 63818396

Test: make -j
Change-Id: I9a879764b7ac16b2683a79f5365b49249c5c8d78
2017-07-19 12:39:53 -07:00
TreeHugger Robot
9fa81d232d Merge "Unhide several Fingerprint APIs" 2017-07-19 19:02:19 +00:00
Tomasz Wasilczyk
4482b14136 Implement out-of-band metadata images.
This saves a lot of HIDL bandwidth, by not including raw image data in
metadata vector.

Bug: b/63702941
Test: instumentalization, none added
Change-Id: I4aa3df126e4e9ab1821d98ea91d4badec5a2cf82
2017-07-19 11:20:06 -07:00
Tomasz Wasilczyk
ea0302a958 Add DRMO_MODULATION program identifier type.
Bug: b/63702941
Test: it builds
Change-Id: I430af5a98fa29f7666be815947c8456fc37e54ab
2017-07-19 06:53:24 -07:00
Tomasz Wasilczyk
72e8ceda91 Merge "Make it possible to check if a given program/identifier type is supported." 2017-07-18 17:00:54 +00:00
Tomasz Wasilczyk
c7cb51099c Merge "Fill announcement-related gaps in Broadcast Radio APIs." 2017-07-18 16:49:17 +00:00
Tomasz Wasilczyk
9f02a4ee69 Merge "Deprecate onMetadataChanged." 2017-07-18 16:15:17 +00:00
Tomasz Wasilczyk
38d9ee4cd6 Merge "Implement ProgramSelector for font-end Java APIs." 2017-07-18 15:36:22 +00:00
Tomasz Wasilczyk
54587ced03 Make it possible to check if a given program/identifier type is supported.
Test: instrumentalization
Bug: b/63702941
Change-Id: I436b62fa4cda8458a92a15a75543bedd43e65dcd
2017-07-17 16:28:18 -07:00
Tomasz Wasilczyk
c4cd823a2e Fill announcement-related gaps in Broadcast Radio APIs.
- adds TA and TP flags to ProgramInfo struct
- adds a callback to cancel announcement

Bug: b/63702941
Test: Instrumentalization, VTS
Change-Id: I09317c8ee837ee3f522037d0a727b095ef9a87a6
2017-07-17 16:28:17 -07:00
Tomasz Wasilczyk
24250ef948 Deprecate onMetadataChanged.
All ProgramInfo changes are passed now by onProgramInfoChanged callback.

The onMetadataChanged callback is still called for compatibility reasons.

Bug: b/32621193
Test: instrumentalization (none added)
Change-Id: I80be8d3b55614c618514ac1e081a3ba60f4060b3
2017-07-17 16:28:17 -07:00
Tomasz Wasilczyk
8cfb0e81fd Implement ProgramSelector for font-end Java APIs.
Bug: b/32621193
Test: instrumentalization
Change-Id: Ibb9841fed76ef3568c2e36ca28ea31addf9175f1
2017-07-17 16:23:05 -07:00
Jeff Sharkey
6f95ab2f1d Break the rules.
Test: none
Bug: 62270037
Change-Id: I042539ae90fdc0d80e9c0ff35aa0baf500b05811
2017-07-17 13:15:16 -06:00
Peng Xu
09d2265a55 Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am: 17e641dae5 am: 7bef937503
am: 5f309c6fd3

Change-Id: I03ff03b1ffe5e275f1551c3946eddc4fd766fd7b
2017-07-14 23:27:14 +00:00
Peng Xu
7bef937503 Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
am: 17e641dae5

Change-Id: I4391dafa9d153213e35ac58bceb8d2f4c958fde0
2017-07-14 23:07:11 +00:00
Eino-Ville Talvala
b57501a8d9 Merge "CameraManager: Handle camera service being disabled explicitly" into oc-dr1-dev am: 0c0fd0375c
am: 01d6fb2c9c

Change-Id: I7a2399498f7f234a09545107b0fdda3cade6ee30
2017-07-14 05:55:35 +00:00
Arthur Ishiguro
3087951777 Merge "Fix default constructor for NanoApp" 2017-07-13 23:23:26 +00:00
Arthur Ishiguro
afaddaaffb Fix default constructor for NanoApp
Bug: 37274363
Test: Compile and run CHQTS, verify warning not shown
Change-Id: I842f8571be31838b726fecfb138f329dea5f26fe
2017-07-13 13:25:33 -07:00
Eino-Ville Talvala
19d96a197f CameraManager: Handle camera service being disabled explicitly
Previously, CameraManager handled a disabled camera service
implicitly, the same as it handles a temporarily-crashed camera
service.

However, the error reporting for the those cases isn't really the
same, so switch to being explicit - check for the disabled camera
service system property, and if it's set, short-circuit calls.

Test: Camera CTS continues to pass, Watch device with no camera
      service also now passes camera CTS.
Bug: 62269118

Change-Id: I65a97f8c1b0f101999b2c04d4f1096b7f3aee858
2017-07-13 12:23:51 -07:00