summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-12-05[automerger skipped] Merge "Fix accidental implicit fallthroughs" into ↵android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android10-qpr3-s1-releaseandroid10-qpr3-releaseAutomerger Merge Worker
oc-mr1-dev am: f5d56edc27 -s ours am: 57badc4ae2 -s ours am: 5c33d5b916 -s ours am: 49fff87ce0 -s ours am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 fbeb4fc139 is in history Change-Id: I913fa667e484f943270217c34d50f90fe64ce9a6
2019-12-05[automerger skipped] Merge "Fix accidental implicit fallthroughs" into ↵Automerger Merge Worker
oc-mr1-dev am: f5d56edc27 -s ours am: 57badc4ae2 -s ours am: 5c33d5b916 -s ours am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 fbeb4fc139 is in history Change-Id: Ia9155f11e19ef76f4385f1e0a61a9a11b1f8e26c
2019-12-05[automerger skipped] Merge "Fix accidental implicit fallthroughs" into ↵Automerger Merge Worker
oc-mr1-dev am: f5d56edc27 -s ours am: 57badc4ae2 -s ours am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 fbeb4fc139 is in history Change-Id: I442d2d11aaae85eae52a5ee3bf2b5b677423c9e8
2019-12-05[automerger skipped] Merge "Fix accidental implicit fallthroughs" into ↵Automerger Merge Worker
oc-mr1-dev am: f5d56edc27 -s ours am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 fbeb4fc139 is in history Change-Id: I5497444c80633999820bf0380a50194b74a7ba45
2019-12-05Merge "Fix accidental implicit fallthroughs" into oc-mr1-devTreeHugger Robot
2019-12-04[automerger skipped] Fix accidental implicit fallthroughs am: fbeb4fc139 am: ↵Automerger Merge Worker
85eac001da am: 89462bd0e6 -s ours am: 0d411bddad -s ours am: 49e01145d5 -s ours am: 3235fb8377 -s ours am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 540824e658 is in history Change-Id: I4d37c610262fc6dbcd614eff0436c74becec497e
2019-12-04[automerger skipped] Fix accidental implicit fallthroughs am: fbeb4fc139 am: ↵Automerger Merge Worker
85eac001da am: 89462bd0e6 -s ours am: 0d411bddad -s ours am: 49e01145d5 -s ours am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 540824e658 is in history Change-Id: Ifd522d853cc0fd2e27e01da09f381ec1aad0983e
2019-12-04[automerger skipped] Fix accidental implicit fallthroughs am: fbeb4fc139 am: ↵Automerger Merge Worker
85eac001da am: 89462bd0e6 -s ours am: 0d411bddad -s ours am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 540824e658 is in history Change-Id: I9153936b4ebc3714bce40e3ecc828d28a186068a
2019-12-04[automerger skipped] Fix accidental implicit fallthroughs am: fbeb4fc139 am: ↵Automerger Merge Worker
85eac001da am: 89462bd0e6 -s ours am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 e43fe9ddf2 is in history Change-Id: If4f49b15f9e70c4288e7f5b153938a2d0ee25876
2019-12-04Fix accidental implicit fallthroughs am: fbeb4fc139 am: 85eac001daAutomerger Merge Worker
Change-Id: I74f180f5154637eef3261e43a4b4691a435ae715
2019-12-04Fix accidental implicit fallthroughs am: fbeb4fc139Automerger Merge Worker
Change-Id: I3cb7f4a81839065f4d91f334833b1347e6f05d11
2019-12-04[automerger skipped] Merge "Fix accidental implicit fallthroughs" into ↵Automerger Merge Worker
qt-dev am: 2c4ce12ed7 -s ours am: 0d6a27f566 -s ours am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 e43fe9ddf2 is in history Change-Id: Ic88603d71e775c4f1683045db2bc76ed8e801e6a
2019-12-04[automerger skipped] Merge "Fix accidental implicit fallthroughs" into ↵Automerger Merge Worker
qt-dev am: 2c4ce12ed7 -s ours am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 e43fe9ddf2 is in history Change-Id: I13d391006c1449b56e62902cf44d87902947cd8e
2019-12-04Merge "Fix accidental implicit fallthroughs" into qt-devTreeHugger Robot
2019-12-04[automerger skipped] Fix accidental implicit fallthroughs am: e43fe9ddf2 am: ↵Automerger Merge Worker
876dd34376 am: 8dbb6dee8f -s ours am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 bfcf9140fe is in history Change-Id: I61aef7ac0f2b0a5a02718658e913ec19d6dd4add
2019-12-04Fix accidental implicit fallthroughs am: e43fe9ddf2 am: 876dd34376Automerger Merge Worker
Change-Id: I38046073df4d71624597a997367fb82fc5cecbf0
2019-12-04Fix accidental implicit fallthroughs am: e43fe9ddf2Automerger Merge Worker
Change-Id: I9bf99133ea0cf8b5cd4c4e4010d5a8e5a29b2547
2019-11-26Fix 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
2019-11-26Fix 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
2019-11-26Fix 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
2019-11-26Fix 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
2019-11-26Fix 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
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-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
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