Commit graph

5031 commits

Author SHA1 Message Date
Eric Laurent
7ace316bd3 [automerger skipped] Merge "remote submix: force pipe shutdown on input close" am: 3e4de69cbf -s ours am: 3f9c4488b0 -s ours am: 547a8c3c51 -s ours
am: 8a0efbe157 -s ours
am skip reason: change_id I4391e73874e502da5000b1746436fb61bb2fe869 with SHA1 5b78d41954 is in history

Change-Id: I34d2004d3c0efb8d143a892d1c1d98a732bf6917
2019-07-26 21:40:15 -07:00
Eric Laurent
8a0efbe157 [automerger skipped] Merge "remote submix: force pipe shutdown on input close" am: 3e4de69cbf -s ours am: 3f9c4488b0 -s ours
am: 547a8c3c51 -s ours
am skip reason: change_id I4391e73874e502da5000b1746436fb61bb2fe869 with SHA1 5b78d41954 is in history

Change-Id: I6ad566e03594b1ed2c99e4b198342e560f4286cf
2019-07-26 21:30:16 -07:00
Eric Laurent
547a8c3c51 [automerger skipped] Merge "remote submix: force pipe shutdown on input close" am: 3e4de69cbf -s ours
am: 3f9c4488b0 -s ours
am skip reason: change_id I4391e73874e502da5000b1746436fb61bb2fe869 with SHA1 5b78d41954 is in history

Change-Id: I73f2efbafa48435e0e3bea31a96732af4e317632
2019-07-26 21:20:12 -07:00
Eric Laurent
3f9c4488b0 [automerger skipped] Merge "remote submix: force pipe shutdown on input close"
am: 3e4de69cbf -s ours
am skip reason: change_id I4391e73874e502da5000b1746436fb61bb2fe869 with SHA1 5b78d41954 is in history

Change-Id: I0df6d6ff6a4f8f5662cf6ce511e0460c53326ec6
2019-07-26 21:10:15 -07:00
Treehugger Robot
3e4de69cbf Merge "remote submix: force pipe shutdown on input close" 2019-07-27 03:53:36 +00:00
Eric Laurent
f76f1832d1 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
Merged-In: I4391e73874e502da5000b1746436fb61bb2fe869
Change-Id: I4391e73874e502da5000b1746436fb61bb2fe869
2019-07-26 15:10:03 -07:00
Xin Li
1cccbd2cd4 DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: cbea0e7da4

Change-Id: I7c4867b669e2dd5f811c9a75bc407d4334a8f812
2019-07-02 13:21:34 -07:00
Xin Li
cbea0e7da4 DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
Bug: 134405016
Change-Id: I236395150bd85dabab3266f6dcd14a0c8888b725
2019-07-01 20:59:53 +00:00
Vineeta Srivastava
d7d15071d8 Strip sensors HAL module.
am: bc5b610f7b

Change-Id: I031d5cab57d03657b28e7ae3679f7a61bf2e3c15
2019-06-17 12:17:03 -07:00
Vineeta Srivastava
bc5b610f7b Strip sensors HAL module.
Bug: 134685292
Test: verified on a device that the library size reduces.
Change-Id: Ic22948a050f59b6ec0ae38dd89184f531d8b5c01
2019-06-12 08:34:24 -07:00
Changyeon Jo
d99445a9e1 Remove libBionicGtestMain am: b6f4830d89
am: a03204da66

Change-Id: I73e48b08381d6a1594364319d94cc15d6f7dd98a
2019-06-05 01:37:56 -07:00
Changyeon Jo
11242e4cee Remove libBionicGtestMain am: b6f4830d89
am: 0133ca96ad

Change-Id: Ia26d515d854721ec50e8e0890d6faa95f65ae404
2019-06-05 01:33:56 -07:00
Changyeon Jo
0133ca96ad Remove libBionicGtestMain
am: b6f4830d89

Change-Id: If3f0e55f458364cead1102c8c46169c76bb26df9
2019-06-05 01:13:01 -07:00
Changyeon Jo
a03204da66 Remove libBionicGtestMain
am: b6f4830d89

Change-Id: I7d6e4c1861a31940898e70186638c188ef1d1e29
2019-06-05 01:13:00 -07:00
Changyeon Jo
b6f4830d89 Remove libBionicGtestMain
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-06-04 09:18:28 -07:00
Valerie Hau
0d6211d431 Merge "Add validateBufferSize and getTransportSize to gralloc.h" into qt-dev
am: f865a5680f

Change-Id: I04f786a8108bd30eabec74ee3a49251d3d2c2969
2019-05-06 09:29:18 -07:00
Valerie Hau
f865a5680f Merge "Add validateBufferSize and getTransportSize to gralloc.h" into qt-dev 2019-05-06 16:11:34 +00:00
Valerie Hau
97479fd486 Merge "Make validateBufferSize and getTransportSize mandatory" into qt-dev
am: cdbe0ed9ce

Change-Id: I55322114e8b108ec80d221cf65559823954a9e3f
2019-04-25 02:18:44 -07:00
Valerie Hau
5543b1eb04 Add validateBufferSize and getTransportSize to gralloc.h
This reverts commit ae6d8a3e33.

Bug: 130669566
Test: build, boot
Change-Id: Icdb3b1e0534233995d5c0594feede6261033ec45
2019-04-24 22:44:42 +00:00
Valerie Hau
cdbe0ed9ce Merge "Make validateBufferSize and getTransportSize mandatory" into qt-dev 2019-04-24 20:52:57 +00:00
Valerie Hau
c16918a2b2 Revert "Add validateBufferSize and getTransportSize to gralloc.h"
am: ae6d8a3e33

Change-Id: Id18f3c988edc92c3f8398d0864d5a3bda2caa112
2019-04-23 16:25:00 -07:00
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
658210f577 Add validateBufferSize and getTransportSize to gralloc.h
am: 491378a3d4

Change-Id: I53427d5210fda831e0eee83fc08bdf9838bbfc53
2019-04-23 15:22:28 -07:00
Valerie Hau
1155c41d01 Make validateBufferSize and getTransportSize mandatory
Bug: 131089111
Test: build, boot
Change-Id: I6c83e4ea9692fbdb185ff0679ee76b1dc826495e
2019-04-23 11:38:33 -07: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
1b45e01e02 Merge "Deprecate getDisplayBrightnessSupport." into qt-dev
am: 252fd9dfe8

Change-Id: I2731ca56556f29d18e847444333e321b89af2694
2019-04-17 14:29:56 -07:00
Peiyong Lin
252fd9dfe8 Merge "Deprecate getDisplayBrightnessSupport." into qt-dev 2019-04-17 20:13:42 +00:00
Franois Gaffie
4fba9711a5 Fix remote submix MIX_RECORD stop
am: 71832e785c

Change-Id: I670bb3bdc9454d8e2aca2d0f05739c36622b38fa
2019-04-15 19:00:01 -07: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