The Android Open Source Project
32450ba903
am d9db09d7
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'd9db09d723538253169d4e297ff4fa974d16809e':
2012-11-01 07:54:36 -07:00
The Android Open Source Project
d9db09d723
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ieb5a478a87c7f3a3bb38e588c92e6768c047bb29
2012-11-01 07:52:10 -07:00
The Android Automerger
c55d7ac337
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-31 18:34:07 -07:00
Jean-Michel Trivi
76e678cdde
am 413f693c
: am 90b0fbd1
: Shutdown audio pipe when closing input stream
...
* commit '413f693c90c0f7191c27c70b192ca92a68aa77c7':
Shutdown audio pipe when closing input stream
2012-10-31 14:03:30 -07:00
Jean-Michel Trivi
413f693c90
am 90b0fbd1
: Shutdown audio pipe when closing input stream
...
* commit '90b0fbd13f97127e29ea565c09b64cc25ab6e9c9':
Shutdown audio pipe when closing input stream
2012-10-31 14:00:49 -07:00
Jean-Michel Trivi
90b0fbd13f
Shutdown audio pipe when closing input stream
...
Writing to the audio pipe for the remote submix is blocking, unless
the audio output pipe is in shutdown mode. The playback thread
could stay blocked on the write if the input stream has already
been closed.
The change consists in shutting down the pipe also when the input
stream gets closed. When the pipe is in this state, simulate
timing in the write operation so we don't drain the output faster
than realtime.
Bug 7424646
Change-Id: I5feb3be642b0ee7eef10dee0141308684ee9c811
2012-10-30 19:03:22 -07:00
Marco Nelissen
b0acad33a7
Remove unused methods from fx library API
...
Change-Id: Ifb1d8b596a34f8413819279c46cb236fd7fb04f4
2012-10-25 11:03:22 -07:00
The Android Open Source Project
b397512231
am 580904ea
: (-s ours) Reconcile with jb-mr1-factory-release - do not merge
...
* commit '580904ea01f291b4b52dcea6da6345a2c3a16988':
2012-10-12 07:33:29 -07:00
The Android Open Source Project
580904ea01
Reconcile with jb-mr1-factory-release - do not merge
...
Change-Id: Ic82b52d2ef117f9c7820c88a8e44b81b25766f80
2012-10-12 07:31:16 -07:00
The Android Automerger
c2805849c5
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-11 08:19:20 -07:00
The Android Open Source Project
b97f4382ab
am cf8f3b24
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'cf8f3b2426c788bb5d83e11bee74e128e9c37309':
2012-10-11 08:08:11 -07:00
The Android Open Source Project
cf8f3b2426
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I385ce51e37f3116c03d7de78036f4ed7ad883641
2012-10-11 08:05:17 -07:00
The Android Automerger
b97ae066d5
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-11 07:03:53 -07:00
Jean-Michel Trivi
af05ad5bb6
am 40483c73
: am 20c7f50c
: Support querying active record sources
...
* commit '40483c7371578ca7477ea0a07d6541fe1daf0f4c':
Support querying active record sources
2012-10-10 17:23:10 -07:00
Jean-Michel Trivi
40483c7371
am 20c7f50c
: Support querying active record sources
...
* commit '20c7f50cd5d60ee7d76f2f502866187992e7675b':
Support querying active record sources
2012-10-10 16:34:11 -07:00
Jean-Michel Trivi
20c7f50cd5
Support querying active record sources
...
Add support for querying whether there is currently a recording
underway from the specified audio source.
Bug 7314859
Change-Id: I270f27eff4dcf1cc179089859a4c690140825ad1
2012-10-10 12:23:17 -07:00
The Android Open Source Project
5960d76855
am f97af999
: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit 'f97af999b91122116b953d1f06b48c00e18a4531':
2012-10-10 09:47:46 -07:00
The Android Open Source Project
f97af999b9
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: Ib081b6a0369bd5a597e53ee3a5551f5a63b67939
2012-10-10 09:44:59 -07:00
The Android Automerger
4ba4655ec3
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-10 08:55:55 -07:00
The Android Automerger
41ef60e365
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-10 06:59:31 -07:00
The Android Automerger
97e4ca0df0
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-09 16:07:22 -07:00
The Android Automerger
a644b63403
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-09 15:39:04 -07:00
Jamie Gennis
113d4abd96
am 44ecdf72
: am c7545189
: hwcomposer: Specify set() call error behavior.
...
* commit '44ecdf72686fdff76e6f1d76a12f734631f45d2c':
hwcomposer: Specify set() call error behavior.
2012-10-09 13:01:26 -07:00
Jamie Gennis
44ecdf7268
am c7545189
: hwcomposer: Specify set() call error behavior.
...
* commit 'c7545189c8b260bbaf09653407450418a3d1860b':
hwcomposer: Specify set() call error behavior.
2012-10-09 12:59:17 -07:00
Jamie Gennis
c7545189c8
hwcomposer: Specify set() call error behavior.
...
Bug: 7308829
Change-Id: Ibab6f0d2929860f02c17d6ffadb326fc0c333c4d
2012-10-08 19:25:20 -07:00
The Android Open Source Project
1724f3c375
am 53694360
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '53694360600f087c1cb8e78e39451886b5cb07bf':
2012-10-02 09:21:11 -07:00
The Android Open Source Project
5369436060
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I9bc9016d2ef2607e2a6fd596f9c6828872e7de6f
2012-10-02 09:18:43 -07:00
The Android Automerger
e037cfb1bc
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-02 06:59:45 -07:00
Martijn Coenen
ff9e286a22
am 0cc0492e
: am 3fb2be64
: Merge "NFC HAL: Use a separate callback for data." into jb-mr1-dev
...
* commit '0cc0492eaba1c3bc9626534ef75832fec51bd966':
NFC HAL: Use a separate callback for data.
2012-10-01 14:06:34 -07:00
Martijn Coenen
0cc0492eab
am 3fb2be64
: Merge "NFC HAL: Use a separate callback for data." into jb-mr1-dev
...
* commit '3fb2be64fffda871ab2d7a2bf8fb98a3cc8835a5':
NFC HAL: Use a separate callback for data.
2012-10-01 14:04:35 -07:00
Martijn Coenen
3fb2be64ff
Merge "NFC HAL: Use a separate callback for data." into jb-mr1-dev
2012-10-01 14:02:07 -07:00
Jean-Michel Trivi
ae5086b648
am b91ddfef
: am 4d7640ae
: Merge "bug 7253033 Add "exiting" state to remote audio submix module" into jb-mr1-dev
...
* commit 'b91ddfef3d12c9e323e1dc081526521546b98b34':
bug 7253033 Add "exiting" state to remote audio submix module
2012-10-01 13:45:14 -07:00
Jean-Michel Trivi
b91ddfef3d
am 4d7640ae
: Merge "bug 7253033 Add "exiting" state to remote audio submix module" into jb-mr1-dev
...
* commit '4d7640ae5143ce991ee76abe0622eaf272a149de':
bug 7253033 Add "exiting" state to remote audio submix module
2012-10-01 10:15:09 -07:00
The Android Automerger
96e003e0da
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-30 18:17:45 -07:00
Jean-Michel Trivi
4d7640ae51
Merge "bug 7253033 Add "exiting" state to remote audio submix module" into jb-mr1-dev
2012-09-30 11:56:23 -07:00
Jean-Michel Trivi
d44130339c
bug 7253033 Add "exiting" state to remote audio submix module
...
Support receiving a parameter that sets the remote audio submix
module in a state where the audio pipe will unblock any current
write operation and not block anymore.
Change-Id: Ia3119cd79972afff0de24187dae627855a468ebf
2012-09-30 11:12:28 -07:00
Martijn Coenen
442752aecd
NFC HAL: Use a separate callback for data.
...
Bug: 7258325
Change-Id: I02d8ea1bdcb8ea6a9430e3dc286f5c2647277f72
2012-09-30 11:08:49 -07:00
The Android Automerger
67dde9aca9
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-30 06:59:43 -07:00
Alex Ray
48ea465ab4
am 4ae33e93
: am cecacd4e
: Camera2: Change JPEG transport header
...
* commit '4ae33e93db3e761813ececca08b19c7a12227840':
Camera2: Change JPEG transport header
2012-09-28 12:51:21 -07:00
Alex Ray
4ae33e93db
am cecacd4e
: Camera2: Change JPEG transport header
...
* commit 'cecacd4e71c35fd50dbe1e9855cbab0faa17b550':
Camera2: Change JPEG transport header
2012-09-28 12:49:25 -07:00
Alex Ray
cecacd4e71
Camera2: Change JPEG transport header
...
The way buffers are passed to JPEG encoders makes it difficult to
account for a header offset. This explains moving the header to
the end, and clarifies the required header packing.
Bug: 7108816
Change-Id: I569cd0cde37bd6fd7110fbc95d7fced9a55cff9c
2012-09-27 22:08:55 -07:00
The Android Open Source Project
88289d4fb8
am ee7df8ca
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'ee7df8cae454ba6fabd7cb7db88e27013456f891':
2012-09-24 10:14:54 -07:00
The Android Open Source Project
ee7df8cae4
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ie1ba92a7c1b156a8a32deca7e2f55181f1c626eb
2012-09-24 10:12:37 -07:00
Eino-Ville Talvala
0cbc4dfdb4
am 13e8b51d
: am 3a90d596
: Merge "Camera2: Add JPEG transport header" into jb-mr1-dev
...
* commit '13e8b51d5b1be40d95b7515ac291cd665ec8ae09':
Camera2: Add JPEG transport header
2012-09-24 08:49:03 -07:00
Eino-Ville Talvala
13e8b51d5b
am 3a90d596
: Merge "Camera2: Add JPEG transport header" into jb-mr1-dev
...
* commit '3a90d5964bc17ace1097e06a62d0410241c6c99c':
Camera2: Add JPEG transport header
2012-09-24 08:25:53 -07:00
The Android Automerger
6d3ab64432
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-22 09:42:02 -07:00
Eino-Ville Talvala
3a90d5964b
Merge "Camera2: Add JPEG transport header" into jb-mr1-dev
2012-09-21 18:33:51 -07:00
The Android Automerger
4af49c64f7
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-21 06:59:54 -07:00
Jesse Hall
a962f928fe
am 5c1bafdb
: am 919e1c45
: Merge "Document reentrancy and error conditions" into jb-mr1-dev
...
* commit '5c1bafdbce676af17d08ba4d0412edda8baecf56':
Document reentrancy and error conditions
2012-09-20 15:46:11 -07:00
Jesse Hall
5c1bafdbce
am 919e1c45
: Merge "Document reentrancy and error conditions" into jb-mr1-dev
...
* commit '919e1c45b77b99c0215a53ab93d8032abb6d8c26':
Document reentrancy and error conditions
2012-09-20 14:13:53 -07:00