Commit graph

5006 commits

Author SHA1 Message Date
Valerie Hau
ae6d8a3e33 Revert "Add validateBufferSize and getTransportSize to gralloc.h"
This reverts commit 491378a3d4.

Reason for revert: Break Elfin
Bug: 130669566
Change-Id: I07c6883872ed9033ec5edbf27b0bd423ead39962
2019-04-23 22:55:18 +00:00
Valerie Hau
491378a3d4 Add validateBufferSize and getTransportSize to gralloc.h
Bug: 130669566
Test: build, boot

Change-Id: Ic141e1c6f16d0e3c1e81c2bc6c5170e30bc60f3f
2019-04-23 11:38:03 -07:00
Peiyong Lin
252fd9dfe8 Merge "Deprecate getDisplayBrightnessSupport." into qt-dev 2019-04-17 20:13:42 +00:00
François Gaffie
71832e785c Fix remote submix MIX_RECORD stop
Since rework of presentationTimestamp in AudioFlinger, it is expecting
to drain correctly before stopping an output.
When a MIX RECORDER is set,
1/ Dynamic Policy Mix is registered
2/ Extraction Sink Port is made available
3/ Player is started on this sink
4/ Extraction source port is connected upon start Output
4/ Capture may be launched on the source to be rerouted
5/ All Capture are stopped, player is stopped
6/ Extraction source port shall be disconnected on stopOutput

Step 6 does not happen as the track is never set as drained.

Upon capture stop, rxSink MonoPipe is put in shutdown state. Any further
write will discard the buffer. However, frames written shall be
incremented of these frame discarded to be able to set the track as
drained.

This CL fixes this issue.

Test: AudioPolicyEmulatorTests --gtest_filter=RecordInjectionSourceMatch/DynamicPolicyMixRecordInjectionTest.RecordingInjection/*
Bug: 130356101
Change-Id: I861c4867991da8bcc1090be56d64e69646d58dc2
Signed-off-by: François Gaffie <francois.gaffie@renault.com>
2019-04-15 14:34:06 -07:00
Peiyong Lin
59dedc31e8 Deprecate getDisplayBrightnessSupport.
Brightness is already a per display capability, we don't need this API.

BUG: 130313275
Test: build
Change-Id: If1ddf2a6224c9aa86f250178fc5cae3b01334b57
2019-04-15 13:59:18 -07:00
Bill Rassieur
f9539ce315 Merge master@5428150 into git_qt-dev-plus-aosp.
am: d1456834e7

Change-Id: I647e73350a6b6aaa7ccc77b3c24aa47d8f6c9eba
2019-04-03 16:48:43 -07:00
Matthew Maurer
f79d5f4dbe Merge "Add KM_TRUSTED_CONFIRMATION_REQUIRED" am: c559ff3937 am: c58c139801
am: 9c5b803a88

Change-Id: I044188282872292fc745bf85b4e3ca8126ce8a43
2019-04-03 10:46:53 -07:00
Matthew Maurer
9c5b803a88 Merge "Add KM_TRUSTED_CONFIRMATION_REQUIRED" am: c559ff3937
am: c58c139801

Change-Id: I9b23f7d28c99cf368a7d32c6513f3a8091652bb3
2019-04-03 10:36:35 -07:00
Matthew Maurer
c58c139801 Merge "Add KM_TRUSTED_CONFIRMATION_REQUIRED"
am: c559ff3937

Change-Id: I5586f43c01e490727dcda5f01e92b3de638b07ac
2019-04-03 10:10:56 -07:00
Matthew Maurer
c559ff3937 Merge "Add KM_TRUSTED_CONFIRMATION_REQUIRED" 2019-04-03 16:32:07 +00:00
Bill Rassieur
d1456834e7 Merge master@5428150 into git_qt-dev-plus-aosp.
Change-Id: Ibe38131f3e562bfe823e87acc1fe1700f29b7c9a
BUG: 129345239
2019-04-02 18:34:08 +00:00
Matthew Maurer
0b9dc0d026 Add KM_TRUSTED_CONFIRMATION_REQUIRED
This was added in KM4, but didn't make it into this header.

Additionally, KM_TAG_UNLOCKED_DEVICE_REQUIRED was squatting on
KM_TRUSTED_CONFIRMATION_REQUIRED's number.

See hardware/interfaces/keymaster/4.0/types.hal for correct numbering.

Bug: 128851722
Test: Keymaster VTS 4.0 + Trusty
Change-Id: I89117ffe91602884edb8dd19ffd22e659f40fb1c
2019-03-26 00:18:24 +00:00
Emilian Peev
654acbee66 Camera: Update 'CAMERA3_MSG_ERROR_RESULT' comments
Extend "CAMERA3_MSG_ERROR_RESULT" comments and describe
how Hal must notify about physical device result failures
and logical device result failures.

Bug: 128835627
Test: Successful build
Change-Id: I935fba5a5676a0fe9440f43b281fc9eeb50578ea
2019-03-21 13:59:59 -07:00
Dan Gittik
10510ff31b Moved brightness from Lights to SF.
Test: manual.
      Check that brightness works.
Fixes: 111435292

Change-Id: I1a741bd57c8e2ce0841c5e25ee6f5c8e866f192a
2019-03-05 20:15:45 +00:00
Eric Laurent
5b78d41954 remote submix: force pipe shutdown on input close
Force mono pipe shutdown when all input stream clients are closed
so that a pending write is not stuck waiting for available buffer.

Bug: 119057550
Test: abort search on BLE remote
Change-Id: I4391e73874e502da5000b1746436fb61bb2fe869
2019-03-04 19:45:12 +00:00
Changyeon Jo
7451fc7e50 Fixes incorrect array initialization.
This change fixes an array initialization failure due to recent
resizing of camera_module structure's reserved variable.

Bug: 126418509
Change-Id: Ifda61b5427f317192976aee788d0e6849f7d189f
Signed-off-by: Changyeon Jo <changyeon@google.com>
2019-02-26 14:35:33 -08:00
Xin Li
cb2db4827f Merge stage-aosp-master into pi-dev-plus-aosp
am: 19a36a9e8a

Change-Id: I38e796edff04f511b4b68320f6c45bb5f1a053f9
2019-02-25 05:36:50 -08:00
Xin Li
19a36a9e8a Merge stage-aosp-master into pi-dev-plus-aosp
Bug: 126125118
Change-Id: I7629bfa002b52a66482bebf3d4a5500819ef46f9
2019-02-25 00:30:26 -08:00
Xin Li
95ee514db5 DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: I699dc4c979ce47e2b399f160a6c04dfe2da8a09b
2019-02-20 16:19:26 -08:00
Yin-Chia Yeh
c861e4c9e7 Merge "Camera: remove stream_configuration_counter" 2019-02-20 19:02:18 +00:00
TreeHugger Robot
d8771edc84 Merge "Camera: clarify unknown error logic in buffer request" 2019-02-14 19:58:05 +00:00
Yin-Chia Yeh
bf1010312e Camera: remove stream_configuration_counter
The race condition is now handled by default HAL wrapper so
we don't need to send this information to HAL implementation.

Test: Pixel 3 + Camera CTS + GCA
Bug: 120986771
Change-Id: I48e611ba45d45ebf34359e828bcb23cb6eec4af2
2019-02-13 15:13:10 -08:00
Emilian Peev
d22172150f camera3: Add support for session parameter queries
Enable Hal to trigger or skip stream reconfiguration
based on session parameter updates.

Bug: 122609098
Test: Manual using application,
VtsHalCameraProviderV2_4TargetTest
--hal_service_instance=android.hardware.camera.provider@2.4::ICameraProvider/legacy/0
--gtest_filter=CameraHidlTest.configureStreamsWithSessionParameters
Change-Id: Ie931e7cb7f46257276cc1796fccd301c85a90d85
2019-02-12 11:06:57 -08:00
Eino-Ville Talvala
3e11b21931 Merge "Camera: Add device state notification to camera_module" 2019-02-11 01:22:52 +00:00
Yin-Chia Yeh
ace57bad57 Camera: clarify unknown error logic in buffer request
Test: N/A. doc update
Bug: 120986771
Change-Id: Ibf4ac8c4618f06f7075ff762f8e1461211cdea7b
2019-02-08 14:57:30 -08:00
Shuzhen Wang
f43b544c0e Camera: Add HEIC encoding support
- Add new BlobId to specify JPEG APP segments.
- Add new gralloc usage flag for HEIC encoder.

Test: testHeic CTS test
Bug: 79465976
Change-Id: Ie70654504eecb280e3a51b60c104124035c5fbe5
2019-02-04 18:18:09 -08:00
Sasha Smundak
77972f7c48 Merge "Explicitly include log/log.h instead of cutils/log.h" am: 68222be667 am: 4b0a646750
am: 99e3058602

Change-Id: I9ccccabeeadaf742ebb4e00264c9dfbd8e769e3c
2019-01-31 20:14:43 -08:00
Sasha Smundak
99e3058602 Merge "Explicitly include log/log.h instead of cutils/log.h" am: 68222be667
am: 4b0a646750

Change-Id: I1ab5925952e6881fe9148394e65a46345df3c801
2019-01-31 20:06:12 -08:00
Sasha Smundak
4b0a646750 Merge "Explicitly include log/log.h instead of cutils/log.h"
am: 68222be667

Change-Id: I52c26b3bee5528e3a195404127cb839990e76be1
2019-01-31 19:54:34 -08:00
Treehugger Robot
68222be667 Merge "Explicitly include log/log.h instead of cutils/log.h" 2019-02-01 03:43:35 +00:00
Sasha Smundak
b41d1a0a74 Explicitly include log/log.h instead of cutils/log.h
Eliminates the warning.
Test: treehugger

Change-Id: I567d8fea169e688165ede1fb35d1338c565e3645
2019-01-31 17:18:27 -08:00
TreeHugger Robot
91085a11f7 Merge "Camera: add device 3.6 and buffer management APIs" 2019-01-30 19:24:30 +00:00
Sergii Piatakov
79facac0f7 Merge "camera: add info about current status into README" am: 3d7f02b0ee am: 11f257623b
am: af36e97a4b

Change-Id: I95f2896055e353060c1a3395520aeb719e986832
2019-01-28 23:38:14 -08:00
Sergii Piatakov
af36e97a4b Merge "camera: add info about current status into README" am: 3d7f02b0ee
am: 11f257623b

Change-Id: I6702a50bf90d28b0000feb918f39d3c40153a6b6
2019-01-28 22:28:23 -08:00
Sergii Piatakov
11f257623b Merge "camera: add info about current status into README"
am: 3d7f02b0ee

Change-Id: I4965e485d4ce0bbe1dfa042b5dd1a105fc89ac60
2019-01-28 20:57:55 -08:00
Treehugger Robot
3d7f02b0ee Merge "camera: add info about current status into README" 2019-01-28 21:20:03 +00:00
Yin-Chia Yeh
875df2a3f4 Camera: add device 3.6 and buffer management APIs
Test: compile
Bug: 120986771
Change-Id: I1e73f70ba05a08e80dcb0c55bb4f54671f201746
2019-01-28 10:10:57 -08:00
Shuzhen Wang
fc590b6ee4 Camera: Add device state notification to camera_module
Test: Confirm logging of device state notifications occurs
Test: Camera continues to function when switched to 2.5
Change-Id: Iac431770be7659c0f419ba8b002a679f38ecaae2
2019-01-25 11:21:34 -08:00
Paul Mclean
83b4d508b9 Merge "Adding Audio HAL V5: Direction API" 2019-01-17 21:34:33 +00:00
Steven Moreland
528258118a Merge "Update auto-generated files." am: 5449a46982 am: b8914c64cf
am: 8abf35a07b

Change-Id: I22741b5a1f7e08afb0d62e7f8894dc021e626a36
2019-01-16 12:06:26 -08:00
Steven Moreland
8abf35a07b Merge "Update auto-generated files." am: 5449a46982
am: b8914c64cf

Change-Id: I86eb798428f5a0823fce8b1d95278d2f68760b8b
2019-01-16 11:58:12 -08:00
Steven Moreland
b8914c64cf Merge "Update auto-generated files."
am: 5449a46982

Change-Id: I165f89b9fd994a0c1ee2f248ba2c64a2e60d98af
2019-01-16 11:44:35 -08:00
Treehugger Robot
5449a46982 Merge "Update auto-generated files." 2019-01-16 19:13:58 +00:00
Steven Moreland
52fc52755d Update auto-generated files.
Test: (sanity) boot
Bug: N/A
Change-Id: I13ae0d30dacea10fc9a9d7b9985902f33422eb54
2019-01-16 17:24:08 +00:00
Ivan Lozano
f2ce75ef3b Merge "Revert "Disable XOM in camera.v4l2."" am: 06ea58579b am: 36de427e99
am: ac77fa8c78

Change-Id: Ia803f91a5487bb0d42ecc73163c34c151795d1c3
2019-01-15 18:02:30 -08:00
Ivan Lozano
ac77fa8c78 Merge "Revert "Disable XOM in camera.v4l2."" am: 06ea58579b
am: 36de427e99

Change-Id: Ic5ac731ef527887cd6c8844d77d7ba1fab192f32
2019-01-15 17:23:15 -08:00
Ivan Lozano
36de427e99 Merge "Revert "Disable XOM in camera.v4l2.""
am: 06ea58579b

Change-Id: I2a69c6882341e7c9fa0fe664bffaef14346da6a6
2019-01-15 17:03:12 -08:00
Treehugger Robot
06ea58579b Merge "Revert "Disable XOM in camera.v4l2."" 2019-01-16 00:41:52 +00:00
Pirama Arumuga Nainar
a7384e2fa8 Merge "Remove extraneous semicolon" am: df93a64586 am: f944bc32e1
am: bb1f895b1a

Change-Id: I142e563acee52ac73ff263d31d0423a8ae7eb20a
2019-01-15 14:36:43 -08:00
Pirama Arumuga Nainar
bb1f895b1a Merge "Remove extraneous semicolon" am: df93a64586
am: f944bc32e1

Change-Id: I664318ec1f3b3291204d67647b4349936772f7af
2019-01-15 14:25:39 -08:00