Commit graph

5042 commits

Author SHA1 Message Date
Xin Li
b8ec08f118 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
am: c727d031fe -s ours
am skip reason: subject contains skip directive

Change-Id: I8f6feefb5fd2a75c65b314c0419298d763c31db5
2019-09-05 13:20:15 -07:00
Xin Li
c727d031fe Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:24 +00:00
Xin Li
4eb6999bbd DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: I8b74ae19788aaaca75ad44c465f7dc458117ccf1
2019-09-04 13:34:19 -07:00
David Benjamin
c94d3334bb Merge "Use bssl::UniquePtr." am: 681881da02
am: 4cb5d27ee8

Change-Id: I95e60cb0098d6834fe0401a6b7c78258cea68e1f
2019-08-19 15:37:02 -07:00
David Benjamin
4cb5d27ee8 Merge "Use bssl::UniquePtr."
am: 681881da02

Change-Id: I5a408faa1c06692e36a689d378ad17a2b013067e
2019-08-19 15:20:55 -07:00
Treehugger Robot
681881da02 Merge "Use bssl::UniquePtr." 2019-08-19 21:40:40 +00:00
Siarhei Vishniakou
e35998b7a3 Merge "Remove custom timestamp from hw/libhw/input" am: 6b14bd1a08
am: 14f4acea32

Change-Id: Idc9a8c0f3479e12e4d8766f00c1f6d9dcb3170a5
2019-08-13 22:20:46 -07:00
Siarhei Vishniakou
14f4acea32 Merge "Remove custom timestamp from hw/libhw/input"
am: 6b14bd1a08

Change-Id: If9a4cf1d3ac09a1a1b853951f3af417669f10c54
2019-08-13 22:09:38 -07:00
Treehugger Robot
6b14bd1a08 Merge "Remove custom timestamp from hw/libhw/input" 2019-08-14 04:41:16 +00:00
Siarhei Vishniakou
1fc88e88f6 Remove custom timestamp from hw/libhw/input
These are no longer used by EventHub, and should not be carried forward.

Bug: 116601048
Test: presubmit only
Merged-In: I35129484d9945dcd4d291e0f2fac894e07c53c04
Change-Id: I35129484d9945dcd4d291e0f2fac894e07c53c04
2019-08-13 14:41:47 -05:00
David Benjamin
4af3eaf74e Use bssl::UniquePtr.
BoringSSL provides std::unique_ptr adapters now, so no need to
reimplement custom ones.

Test: mma
Change-Id: Ia611761e99551b9583b459a04ffa79de9fb08210
2019-08-08 13:05:23 -04:00
Mikhail Naganov
4cd72e2e6c Merge "Remote submix: replace include path with module dependency" am: 9359ffb16b
am: 5290206202

Change-Id: I832b0b968f8dc4317892187e88bee99da5dd39eb
2019-08-05 11:14:17 -07:00
Mikhail Naganov
5290206202 Merge "Remote submix: replace include path with module dependency"
am: 9359ffb16b

Change-Id: Ifb7af40f20ee05a034063c3c179282c301926344
2019-08-05 11:08:23 -07:00
Treehugger Robot
9359ffb16b Merge "Remote submix: replace include path with module dependency" 2019-08-05 17:53:04 +00:00
Mikhail Naganov
282ca7a544 Remote submix: replace include path with module dependency
The include path was needed because libnbaio_mono was missing
an include export for libaudioutils headers.

Test: make
Change-Id: I6d6aa2826ed259b682e8a417557fb6fdfb3caea6
2019-08-02 08:55:16 -07:00
Mikhail Naganov
0440eb8f00 Merge "r_submix: Fix compilation for non-default configurations" am: a5c2957f63
am: fcaa728e9e

Change-Id: Ib892bc1f5e392d5dfce33e59b9d2796972828f23
2019-07-26 21:20:31 -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
Mikhail Naganov
fcaa728e9e Merge "r_submix: Fix compilation for non-default configurations"
am: a5c2957f63

Change-Id: Iaa60e3cf875ce2f0606b4080eff06b66e8fa0072
2019-07-26 21:10:35 -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
a5c2957f63 Merge "r_submix: Fix compilation for non-default configurations" 2019-07-27 04:04:35 +00:00
Treehugger Robot
3e4de69cbf Merge "remote submix: force pipe shutdown on input close" 2019-07-27 03:53:36 +00:00
Mikhail Naganov
1462c760d7 r_submix: Fix compilation for non-default configurations
Fix compilation for:
  #define ENABLE_LEGACY_INPUT_OPEN 0
  #define ENABLE_RESAMPLING 0

Test: make
Change-Id: I11a868c49181b35d3b85ea62a372a94a1b589bc1
2019-07-26 15:11:41 -07: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
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
Changyeon Jo
0133ca96ad Remove libBionicGtestMain
am: b6f4830d89

Change-Id: If3f0e55f458364cead1102c8c46169c76bb26df9
2019-06-05 01:13:01 -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