summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-12-18Merge cherrypicks of [9944759, 9944760, 9944761, 9943995, 9944763, 9942371, ↵android-10.0.0_r29android10-qpr1-d-releaseandroid-build-team Robot
9942372, 9942373, 9942374, 9944689, 9944690, 9944779, 9944766, 9944767, 9944483, 9944413, 9944801, 9944802, 9944803] into qt-qpr1-d-release Change-Id: I60edd1d279662ce2f62a82ca9162a5119802c50c
2019-12-18Fix accidental implicit fallthroughsColin Cross
-Wimplicit-fallthrough was printing warnings for these, they look like real errors. Fix them and re-enable the error. Bug: 144040966 Test: treehugger Merged-In: I818e18a995760f17b85b4c72ee577e531fa2a601 Change-Id: I818e18a995760f17b85b4c72ee577e531fa2a601 (cherry picked from commit bfcf9140fe61eb3d3830daa396ed1992fe613303)
2019-06-18Snap for 5667727 from bc5b610f7b9c40858c8d6d40f58069f5ea130762 to ↵android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android10-qpr1-c-s1-releaseandroid10-qpr1-b-s1-releaseandroid-build-team Robot
qt-qpr1-release Change-Id: Ieca110c0d31fac3fa9da153a2896b128b158081b
2019-06-12Strip sensors HAL module.android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android10-qpr1-mainline-releaseVineeta Srivastava
Bug: 134685292 Test: verified on a device that the library size reduces. Change-Id: Ic22948a050f59b6ec0ae38dd89184f531d8b5c01
2019-06-06Snap for 5637155 from a03204da665fec772e9626f0e6cbf18846d25649 to ↵android-build-team Robot
qt-qpr1-release Change-Id: I59938c09cd32fa31eaadccfaac4cd726bfaba363
2019-06-05Remove libBionicGtestMainChangyeon Jo
am: b6f4830d89 Change-Id: I7d6e4c1861a31940898e70186638c188ef1d1e29
2019-06-04Remove libBionicGtestMainandroid10-devChangyeon Jo
This change removes libBionicGtestMain from the dependency of camera.v4l2_test target. Bug: 134488555 Change-Id: Ia719f770b03fa1679bb9467f58806e64b05eb469 Signed-off-by: Changyeon Jo <changyeon@google.com>
2019-05-06Merge "Add validateBufferSize and getTransportSize to gralloc.h" into qt-devValerie Hau
am: f865a5680f Change-Id: If4530fcd75f2b1baf3ff27325d2c25bbb0c47898
2019-05-06Merge "Add validateBufferSize and getTransportSize to gralloc.h" into qt-devValerie Hau
2019-04-24Add validateBufferSize and getTransportSize to gralloc.hValerie Hau
This reverts commit ae6d8a3e339315b6317d01ff5452da9d89a16c1e. Bug: 130669566 Test: build, boot Change-Id: Icdb3b1e0534233995d5c0594feede6261033ec45
2019-04-24Merge "Make validateBufferSize and getTransportSize mandatory" into qt-devValerie Hau
2019-04-23Revert "Add validateBufferSize and getTransportSize to gralloc.h"Valerie Hau
This reverts commit 491378a3d400c45aa63290315d4a5ab8e773de33. Reason for revert: Break Elfin Bug: 130669566 Change-Id: I07c6883872ed9033ec5edbf27b0bd423ead39962
2019-04-23Make validateBufferSize and getTransportSize mandatoryValerie Hau
Bug: 131089111 Test: build, boot Change-Id: I6c83e4ea9692fbdb185ff0679ee76b1dc826495e
2019-04-23Add validateBufferSize and getTransportSize to gralloc.hValerie Hau
Bug: 130669566 Test: build, boot Change-Id: Ic141e1c6f16d0e3c1e81c2bc6c5170e30bc60f3f
2019-04-17Merge "Deprecate getDisplayBrightnessSupport." into qt-devPeiyong Lin
2019-04-15Fix remote submix MIX_RECORD stopFrançois Gaffie
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-15Deprecate getDisplayBrightnessSupport.Peiyong Lin
Brightness is already a per display capability, we don't need this API. BUG: 130313275 Test: build Change-Id: If1ddf2a6224c9aa86f250178fc5cae3b01334b57
2019-04-03Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur
am: d1456834e7 Change-Id: I647e73350a6b6aaa7ccc77b3c24aa47d8f6c9eba
2019-04-03Merge "Add KM_TRUSTED_CONFIRMATION_REQUIRED" am: c559ff3937 am: c58c139801Matthew Maurer
am: 9c5b803a88 Change-Id: I044188282872292fc745bf85b4e3ca8126ce8a43
2019-04-03Merge "Add KM_TRUSTED_CONFIRMATION_REQUIRED" am: c559ff3937Matthew Maurer
am: c58c139801 Change-Id: I9b23f7d28c99cf368a7d32c6513f3a8091652bb3
2019-04-03Merge "Add KM_TRUSTED_CONFIRMATION_REQUIRED"android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Matthew Maurer
am: c559ff3937 Change-Id: I5586f43c01e490727dcda5f01e92b3de638b07ac
2019-04-03Merge "Add KM_TRUSTED_CONFIRMATION_REQUIRED"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-o-mr1-iot-release-1.0.12oreo-mr1-iot-releaseMatthew Maurer
2019-04-02Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur
Change-Id: Ibe38131f3e562bfe823e87acc1fe1700f29b7c9a BUG: 129345239
2019-03-26Add KM_TRUSTED_CONFIRMATION_REQUIREDMatthew Maurer
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-21Camera: Update 'CAMERA3_MSG_ERROR_RESULT' commentsEmilian Peev
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-05Moved brightness from Lights to SF.Dan Gittik
Test: manual. Check that brightness works. Fixes: 111435292 Change-Id: I1a741bd57c8e2ce0841c5e25ee6f5c8e866f192a
2019-03-04remote submix: force pipe shutdown on input closeEric Laurent
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-02-26Fixes incorrect array initialization.Changyeon Jo
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-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
am: 19a36a9e8a Change-Id: I38e796edff04f511b4b68320f6c45bb5f1a053f9
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I7629bfa002b52a66482bebf3d4a5500819ef46f9
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I699dc4c979ce47e2b399f160a6c04dfe2da8a09b
2019-02-20Merge "Camera: remove stream_configuration_counter"Yin-Chia Yeh
2019-02-14Merge "Camera: clarify unknown error logic in buffer request"TreeHugger Robot
2019-02-13Camera: remove stream_configuration_counterYin-Chia Yeh
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-12camera3: Add support for session parameter queriesEmilian Peev
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-11Merge "Camera: Add device state notification to camera_module"Eino-Ville Talvala
2019-02-08Camera: clarify unknown error logic in buffer requestYin-Chia Yeh
Test: N/A. doc update Bug: 120986771 Change-Id: Ibf4ac8c4618f06f7075ff762f8e1461211cdea7b
2019-02-04Camera: Add HEIC encoding supportShuzhen Wang
- 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-01-31Merge "Explicitly include log/log.h instead of cutils/log.h" am: 68222be667 ↵Sasha Smundak
am: 4b0a646750 am: 99e3058602 Change-Id: I9ccccabeeadaf742ebb4e00264c9dfbd8e769e3c
2019-01-31Merge "Explicitly include log/log.h instead of cutils/log.h" am: 68222be667Sasha Smundak
am: 4b0a646750 Change-Id: I1ab5925952e6881fe9148394e65a46345df3c801
2019-01-31Merge "Explicitly include log/log.h instead of cutils/log.h"Sasha Smundak
am: 68222be667 Change-Id: I52c26b3bee5528e3a195404127cb839990e76be1
2019-02-01Merge "Explicitly include log/log.h instead of cutils/log.h"android-q-preview-1android-o-mr1-iot-release-1.0.10Treehugger Robot
2019-01-31Explicitly include log/log.h instead of cutils/log.hSasha Smundak
Eliminates the warning. Test: treehugger Change-Id: I567d8fea169e688165ede1fb35d1338c565e3645
2019-01-30Merge "Camera: add device 3.6 and buffer management APIs"TreeHugger Robot
2019-01-28Merge "camera: add info about current status into README" am: 3d7f02b0ee am: ↵Sergii Piatakov
11f257623b am: af36e97a4b Change-Id: I95f2896055e353060c1a3395520aeb719e986832
2019-01-28Merge "camera: add info about current status into README" am: 3d7f02b0eeSergii Piatakov
am: 11f257623b Change-Id: I6702a50bf90d28b0000feb918f39d3c40153a6b6
2019-01-28Merge "camera: add info about current status into README"Sergii Piatakov
am: 3d7f02b0ee Change-Id: I4965e485d4ce0bbe1dfa042b5dd1a105fc89ac60
2019-01-28Merge "camera: add info about current status into README"Treehugger Robot
2019-01-28Camera: add device 3.6 and buffer management APIsYin-Chia Yeh
Test: compile Bug: 120986771 Change-Id: I1e73f70ba05a08e80dcb0c55bb4f54671f201746
2019-01-25Camera: Add device state notification to camera_moduleShuzhen Wang
Test: Confirm logging of device state notifications occurs Test: Camera continues to function when switched to 2.5 Change-Id: Iac431770be7659c0f419ba8b002a679f38ecaae2