Xin Li
013e175fa7
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: c727d031fe
-s ours am: b8ec08f118
...
am: 5ba5357c36
Change-Id: I18a7f0f362f194e664ddd8fae7ecbbbe362b19eb
2019-09-05 14:20:10 -07:00
Xin Li
5ba5357c36
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: c727d031fe
-s ours
...
am: b8ec08f118
Change-Id: I622691c9eda0a772aef75554c499e6bb1f2a55fb
2019-09-05 13:56:19 -07:00
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
1abb226ffc
Merge "Use bssl::UniquePtr." am: 681881da02
am: 4cb5d27ee8
am: c94d3334bb
...
am: 84e88070a1
Change-Id: If952936fa1f1be683ec8507009feff6e438bf8f9
2019-08-19 16:00:51 -07:00
David Benjamin
84e88070a1
Merge "Use bssl::UniquePtr." am: 681881da02
am: 4cb5d27ee8
...
am: c94d3334bb
Change-Id: I85fd7de36de44fd003650d8e4fb5e2ff115d07a5
2019-08-19 15:48:13 -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
a6e0e58ecd
Merge "Remove custom timestamp from hw/libhw/input" am: 6b14bd1a08
am: 14f4acea32
am: e35998b7a3
...
am: 489f5cd1cc
Change-Id: I4d7bc9be3e614ddd74b5bc30b41f65d8e72e3f5b
2019-08-13 22:42:12 -07:00
Siarhei Vishniakou
489f5cd1cc
Merge "Remove custom timestamp from hw/libhw/input" am: 6b14bd1a08
am: 14f4acea32
...
am: e35998b7a3
Change-Id: Ie8259869952aee389cefeb7d1df0a288ceee1a4f
2019-08-13 22:31:16 -07: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
0bea0da877
Merge "Remote submix: replace include path with module dependency" am: 9359ffb16b
am: 5290206202
am: 4cd72e2e6c
...
am: d7e68975db
Change-Id: I3e0a4dcb60fe4e3886e3fe0b4ae2bad7b4c99f14
2019-08-05 11:29:22 -07:00
Mikhail Naganov
d7e68975db
Merge "Remote submix: replace include path with module dependency" am: 9359ffb16b
am: 5290206202
...
am: 4cd72e2e6c
Change-Id: I9afbed7360648ee6e49cd819a1f63f42e5e789e9
2019-08-05 11:21:15 -07: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
a8cb6b00a8
Merge "r_submix: Fix compilation for non-default configurations" am: a5c2957f63
am: fcaa728e9e
am: 0440eb8f00
...
am: 815f0f234d
Change-Id: I2856b1dba179825c21c29d05ea0b883baa51570e
2019-07-26 21:40:35 -07:00
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
Mikhail Naganov
815f0f234d
Merge "r_submix: Fix compilation for non-default configurations" am: a5c2957f63
am: fcaa728e9e
...
am: 0440eb8f00
Change-Id: Ifd2bf5985bfc0b62dd01fecf8ff4364651c7c311
2019-07-26 21:30:37 -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
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
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