OSDN Git Service
Shawn Willden [Thu, 29 Jan 2015 17:21:35 +0000 (17:21 +0000)]
am
fb823c7f: am
1e541c22: Merge changes I85f430fb,I514a136b
* commit '
fb823c7f6e34973fbfbee788b2ed658dc4544742':
Remove extraneous 'const' on rescope.
Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH to KM_ERROR_UNSUPPORTED_MAC_LENGTH.
Shawn Willden [Thu, 29 Jan 2015 17:21:35 +0000 (17:21 +0000)]
am
9e9fa066: am
1309477b: Merge "Add missing "const" on add_rng_entropy argument."
* commit '
9e9fa066345fd3c17a995f447f07495a0f1eeb13':
Add missing "const" on add_rng_entropy argument.
Shawn Willden [Thu, 29 Jan 2015 01:00:58 +0000 (01:00 +0000)]
am
1e541c22: Merge changes I85f430fb,I514a136b
* commit '
1e541c22d3552b116f0ab3e3a826f458b2821673':
Remove extraneous 'const' on rescope.
Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH to KM_ERROR_UNSUPPORTED_MAC_LENGTH.
Shawn Willden [Thu, 29 Jan 2015 01:00:57 +0000 (01:00 +0000)]
am
1309477b: Merge "Add missing "const" on add_rng_entropy argument."
* commit '
1309477bdaaecc35b468f00045d9b1d005dde377':
Add missing "const" on add_rng_entropy argument.
Shawn Willden [Thu, 29 Jan 2015 00:45:57 +0000 (00:45 +0000)]
Merge changes I85f430fb,I514a136b
* changes:
Remove extraneous 'const' on rescope.
Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH to KM_ERROR_UNSUPPORTED_MAC_LENGTH.
Shawn Willden [Thu, 29 Jan 2015 00:44:56 +0000 (00:44 +0000)]
Merge "Add missing "const" on add_rng_entropy argument."
Shawn Willden [Mon, 26 Jan 2015 23:19:49 +0000 (16:19 -0700)]
Remove extraneous 'const' on rescope.
Change-Id: I85f430fb902fad75f7ce272ac5ab420f212a133c
Shawn Willden [Mon, 26 Jan 2015 20:04:28 +0000 (13:04 -0700)]
Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH to
KM_ERROR_UNSUPPORTED_MAC_LENGTH.
Change-Id: I514a136b5cbdb1ab1df67d44a22d68a09427a711
Shawn Willden [Mon, 26 Jan 2015 20:03:58 +0000 (13:03 -0700)]
Add missing "const" on add_rng_entropy argument.
Change-Id: I584feed0f89f4342e94cc83e165904c78687f610
Kenny Root [Mon, 26 Jan 2015 19:17:35 +0000 (19:17 +0000)]
am
c9832229: am
7b8e44f5: Merge "Remove superfluous OpenSSL include paths."
* commit '
c98322296c13617c911cc66f4578aa5daf08aadb':
Remove superfluous OpenSSL include paths.
Kenny Root [Mon, 26 Jan 2015 19:12:19 +0000 (19:12 +0000)]
am
7b8e44f5: Merge "Remove superfluous OpenSSL include paths."
* commit '
7b8e44f511fdb5bd2730e29cc88f72305cf7ab16':
Remove superfluous OpenSSL include paths.
Kenny Root [Mon, 26 Jan 2015 18:52:53 +0000 (18:52 +0000)]
Merge "Remove superfluous OpenSSL include paths."
Shawn Willden [Sat, 24 Jan 2015 16:57:19 +0000 (16:57 +0000)]
am
e1d15dda: am
79c255ad: Merge "Change per-boot tag and remove rescope auth timeout tag."
* commit '
e1d15dda2a6a34215d4ee3d2f070270d787bf7cd':
Change per-boot tag and remove rescope auth timeout tag.
Zhijun He [Fri, 23 Jan 2015 23:58:17 +0000 (23:58 +0000)]
Merge "camera: update HAL module API for external camera"
Zhijun He [Mon, 12 Jan 2015 22:45:33 +0000 (14:45 -0800)]
camera: update HAL module API for external camera
Update camera module API 2.4 for usb camera support.
Change-Id: Id8329e31ad0622bdc06c60e87e97c742a9719b3b
Shawn Willden [Fri, 23 Jan 2015 22:21:44 +0000 (22:21 +0000)]
am
79c255ad: Merge "Change per-boot tag and remove rescope auth timeout tag."
* commit '
79c255ade3ed7ab00db8041dbf7e2a171cbc32b0':
Change per-boot tag and remove rescope auth timeout tag.
Shawn Willden [Fri, 23 Jan 2015 22:04:53 +0000 (22:04 +0000)]
Merge "Change per-boot tag and remove rescope auth timeout tag."
Shawn Willden [Fri, 23 Jan 2015 08:01:21 +0000 (01:01 -0700)]
Change per-boot tag and remove rescope auth timeout tag.
Change the boolean KM_TAG_SINGLE_USE_PER_BOOT to an integer-valued
KM_TAG_USES_PER_BOOT. This makes it more flexible without changing
implementation complexity.
Remove KM_TAG_RESCOPE_AUTH_TIMEOUT because there's no clear use case and
it seems unnecessarily complex.
Change-Id: Iad1512f5cc80f517e5ea7622288179c162bed2ad
Adam Langley [Fri, 23 Jan 2015 01:16:01 +0000 (17:16 -0800)]
Remove superfluous OpenSSL include paths.
The libcrypto and libssl modules (and their respective static and host
versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module
is sufficient.
Change-Id: I9030a3747b8a1f18acd0308746cb2f63d4123f8b
Shawn Willden [Thu, 22 Jan 2015 21:41:28 +0000 (21:41 +0000)]
am
bde6c2bb: am
b1a12188: Merge "Define keymaster HAL v0.4."
* commit '
bde6c2bb3fca4bc0665701ac99fa2b5b9673a6d6':
Define keymaster HAL v0.4.
Shawn Willden [Thu, 22 Jan 2015 21:36:14 +0000 (21:36 +0000)]
am
b1a12188: Merge "Define keymaster HAL v0.4."
* commit '
b1a1218845eb32564b2f7f0297096ec43b27e41b':
Define keymaster HAL v0.4.
Shawn Willden [Thu, 22 Jan 2015 21:28:56 +0000 (21:28 +0000)]
Merge "Define keymaster HAL v0.4."
Shawn Willden [Thu, 12 Jun 2014 19:48:46 +0000 (13:48 -0600)]
Define keymaster HAL v0.4.
Change-Id: I040412443bbbe25bce3d44759d710b78eac36caa
Jinsuk Kim [Mon, 19 Jan 2015 02:54:58 +0000 (02:54 +0000)]
am
1d1bf8b5: am
8b7eca86: CEC: Add a new flag for set_option
* commit '
1d1bf8b5f648abad900b16eabdfd0813e5d6a6a2':
CEC: Add a new flag for set_option
Jinsuk Kim [Mon, 19 Jan 2015 02:49:37 +0000 (02:49 +0000)]
am
8b7eca86: CEC: Add a new flag for set_option
* commit '
8b7eca867492d8a08285059492ce5697b68b5821':
CEC: Add a new flag for set_option
Jinsuk Kim [Sun, 18 Jan 2015 22:20:09 +0000 (07:20 +0900)]
CEC: Add a new flag for set_option
Added a flag to pass system language information to HAL so that it can
respond to <Get Menu Language> in standby mode.
Bug:
19054079
Change-Id: Iada00307202f5c9429944184b62b6456b624125a
Zhijun He [Fri, 9 Jan 2015 01:40:00 +0000 (17:40 -0800)]
usbcamera: initial implementation of default usb camera HAL
* Basic skeleton of usb camera hal implementation
* Vendor tag is not supported yet
* Further usb camera hal implementation can be filled into UsbCamera.cpp
* Hot plug thread need to be implemented
Change-Id: Ida63b6d640e32192f5b60a280d9d5106d80e523f
Chien-Yu Chen [Thu, 8 Jan 2015 19:06:38 +0000 (11:06 -0800)]
camera_common: add torch mode APIs for flashlight
Add torch mode APIs to support flashlight without opening any
camera devices.
Bug:
2682206
Change-Id: Ida46bb878962caf305f3e97051b15e0465fe8c02
Paul McLean [Tue, 13 Jan 2015 17:37:06 +0000 (09:37 -0800)]
Technical Debt Paydown - move/rename files
Moved audio (alsa actually) utils files to system/core/alsa_utils.
Renamed "audio" utilities to "alsa" to better relect their purpose.
Renamed audio_hw.c -> to audio_hal. c to better reflect its purpose.
Change-Id: I67c7d47ee02abafd3e12c4c99d605a62e0f59122
Eric Laurent [Sat, 10 Jan 2015 01:13:38 +0000 (01:13 +0000)]
am
e6499429: Merge commit \'
83b47a68\' into manualmerge
* commit '
e64994292cb02fae66f04002e1121d29979503d1':
usb audio: Fix incorrect bytes returned for recording
Eric Laurent [Sat, 10 Jan 2015 01:03:27 +0000 (17:03 -0800)]
Merge commit '
83b47a68' into manualmerge
Paul McLean [Fri, 9 Jan 2015 23:11:43 +0000 (23:11 +0000)]
Merge "Multi-USB device support & read device on open."
Pavan Chikkala [Fri, 9 Jan 2015 20:21:13 +0000 (12:21 -0800)]
usb audio: Fix incorrect bytes returned for recording
In a recording session , the number of bytes read is
not updated when pcm_read() fails. This results in
silence/invalid data being added during a device switch
from USB headset to handset.
Fix is to reset the number of bytes read if pcm_read()
returns an error indicating removal of USB headset.
Bug:
18611518
Change-Id: I10d578c3cf1037c90a891e63be2bd1c2b7e6126b
Eric Laurent [Fri, 9 Jan 2015 18:04:14 +0000 (18:04 +0000)]
am
7e9abab1: am
b338957d: Merge "usbaudio: Return 0 bytes on failure in capture"
* commit '
7e9abab1940091b4c4d7589160855870fdda437e':
usbaudio: Return 0 bytes on failure in capture
Eric Laurent [Fri, 9 Jan 2015 17:58:33 +0000 (17:58 +0000)]
am
b338957d: Merge "usbaudio: Return 0 bytes on failure in capture"
* commit '
b338957d02528e5b51a15c5ce21e96fad4ff4a6f':
usbaudio: Return 0 bytes on failure in capture
Eric Laurent [Fri, 9 Jan 2015 17:49:31 +0000 (17:49 +0000)]
Merge "usbaudio: Return 0 bytes on failure in capture"
Viswanath L [Fri, 31 Oct 2014 07:37:39 +0000 (13:07 +0530)]
usbaudio: Return 0 bytes on failure in capture
Return 0 bytes from in_read() in failure conditions so that invalid
data is not recorded.
Change-Id: I9a6294e4162fa642fd7e160a32d1ad16f255ff62
Paul McLean [Tue, 2 Dec 2014 19:36:45 +0000 (12:36 -0700)]
Multi-USB device support & read device on open.
Change-Id: I8b6dd33be1915db764eeaefec5a5da1e9d02dc87
Glenn Kasten [Tue, 30 Dec 2014 18:53:00 +0000 (18:53 +0000)]
Merge "Line length 100"
Glenn Kasten [Tue, 30 Dec 2014 16:32:04 +0000 (08:32 -0800)]
Line length 100
Change-Id: Iaef5bcaec19a9e383432c8c8460bcdf1115f1072
Elliott Hughes [Tue, 30 Dec 2014 12:27:44 +0000 (12:27 +0000)]
am
06fcfc50: am
02e30945: Merge "Fix missing #includes in hardware/libhardware."
* commit '
06fcfc506c44724bbd8089e8971b77aa8edfdde8':
Fix missing #includes in hardware/libhardware.
Elliott Hughes [Tue, 30 Dec 2014 12:21:17 +0000 (12:21 +0000)]
am
02e30945: Merge "Fix missing #includes in hardware/libhardware."
* commit '
02e3094598ced8b05c9614d6070556d20328ef43':
Fix missing #includes in hardware/libhardware.
Elliott Hughes [Mon, 29 Dec 2014 21:17:12 +0000 (21:17 +0000)]
Merge "Fix missing #includes in hardware/libhardware."
Elliott Hughes [Mon, 29 Dec 2014 20:59:11 +0000 (12:59 -0800)]
Fix missing #includes in hardware/libhardware.
Change-Id: If7c72054bf79b89c3d7a544956da671c3b404269
soon1.choi [Thu, 18 Dec 2014 23:22:09 +0000 (23:22 +0000)]
am
7b30900d: (-s ours) am
781bb3f7: DO NOT MERGE - fix: memory leak
* commit '
7b30900df70f34cb24c676e458c322ba9e8525d6':
DO NOT MERGE - fix: memory leak
Eric Laurent [Thu, 18 Dec 2014 23:21:51 +0000 (23:21 +0000)]
am
68be24b1: am
ce0bbb97: Merge "fix: memory leak"
* commit '
68be24b1cc2bad01d9257f76faabd92dbfc6c3e8':
fix: memory leak
soon1.choi [Thu, 18 Dec 2014 21:58:40 +0000 (21:58 +0000)]
am
781bb3f7: DO NOT MERGE - fix: memory leak
* commit '
781bb3f72e2706f07ee8bcc0c140201faf07c35c':
DO NOT MERGE - fix: memory leak
Eric Laurent [Thu, 18 Dec 2014 21:50:36 +0000 (21:50 +0000)]
am
ce0bbb97: Merge "fix: memory leak"
* commit '
ce0bbb97c12b712b75d0df42ce2f6e3f35d8db72':
fix: memory leak
soon1.choi [Thu, 18 Dec 2014 07:03:43 +0000 (16:03 +0900)]
DO NOT MERGE - fix: memory leak
free momory for str_parms to prevent memory leak.
cherry-pcik from aosp
c357157e28dc0ffd069b80aeba9bf8b9eed72c9a
Bug:
18798194.
Change-Id: I7df5567d665554dbd4646c881f0f48b0c568c5fe
Eric Laurent [Thu, 18 Dec 2014 16:42:10 +0000 (16:42 +0000)]
Merge "fix: memory leak"
soon1.choi [Thu, 18 Dec 2014 07:03:43 +0000 (16:03 +0900)]
fix: memory leak
free momory for str_parms to prevent memory leak.
Change-Id: I7df5567d665554dbd4646c881f0f48b0c568c5fe
Jinsuk Kim [Wed, 17 Dec 2014 21:31:28 +0000 (21:31 +0000)]
am
981a952c: am
4b280b0c: CEC: Add a parameter port ID to set_audio_return_channel
* commit '
981a952c5f182727ec306b4e194c50792b303667':
CEC: Add a parameter port ID to set_audio_return_channel
Jinsuk Kim [Wed, 17 Dec 2014 21:24:45 +0000 (21:24 +0000)]
am
4b280b0c: CEC: Add a parameter port ID to set_audio_return_channel
* commit '
4b280b0cd07a380feb4653b911ddcb3a31e73797':
CEC: Add a parameter port ID to set_audio_return_channel
Jinsuk Kim [Wed, 17 Dec 2014 07:22:54 +0000 (16:22 +0900)]
CEC: Add a parameter port ID to set_audio_return_channel
This CL addresses the cases where TV has more than one ARC-supported
HDMI ports.
Bug:
18781204
Change-Id: I4eaeb755caf2552b826a7322d19ee671407ee43f
Dan Albert [Wed, 17 Dec 2014 02:48:22 +0000 (02:48 +0000)]
am
6bafdcb5: am
4f1fe2f5: Merge "Fix build in C++11 mode"
* commit '
6bafdcb5083b81d295676ee0ff75f62b31214150':
Fix build in C++11 mode
Dan Albert [Wed, 17 Dec 2014 02:43:50 +0000 (02:43 +0000)]
am
4f1fe2f5: Merge "Fix build in C++11 mode"
* commit '
4f1fe2f59889d88ed026596c1841043db7edbc6f':
Fix build in C++11 mode
Dan Albert [Wed, 17 Dec 2014 02:29:26 +0000 (02:29 +0000)]
Merge "Fix build in C++11 mode"
Ying Wang [Tue, 16 Dec 2014 21:49:49 +0000 (21:49 +0000)]
am
14a4dd89: am
cecfb56c: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
* commit '
14a4dd8907557760cc0d7d72246444a21e9ddfe1':
Cleanup Obsolete LOCAL_PRELINK_MODULE.
Ying Wang [Tue, 16 Dec 2014 20:53:38 +0000 (20:53 +0000)]
am
cecfb56c: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
* commit '
cecfb56c5192fe1517a8e1b5910f16961db4a231':
Cleanup Obsolete LOCAL_PRELINK_MODULE.
Ying Wang [Tue, 16 Dec 2014 20:40:03 +0000 (20:40 +0000)]
Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
Ying Wang [Tue, 16 Dec 2014 20:33:37 +0000 (12:33 -0800)]
Cleanup Obsolete LOCAL_PRELINK_MODULE.
Bug:
18675947
Change-Id: I62157cd4bfab0edb445dd6543eb47a981e642848
Paul McLean [Mon, 15 Dec 2014 17:44:42 +0000 (09:44 -0800)]
Renaming generic-sounding filenames to indicate "audio".
Change-Id: Iba6403a3493379c39d22d23b438f028efc2e15b7
Paul McLean [Mon, 15 Dec 2014 16:24:50 +0000 (08:24 -0800)]
Technical debt paydown
Removed unused function.
Removed unused data table.
Cleaned up TAG strings.
Change-Id: I4c5dbd72f7363dd0a7a60eb2498e122adda43211
Bernhard Rosenkränzer [Fri, 12 Dec 2014 21:16:55 +0000 (22:16 +0100)]
Fix build in C++11 mode
Fix build in C++11 mode instead of reverting to C++98 mode.
(Fixes some constructs that were mistaken for C++11 literals and
a use of the std::ostream(NULL) constructor).
Building in C++98 mode causes clang to fall over conflicting definitions
of char16_t.
Change-Id: I66230eeb960f4a894d6c98fe7935ec932569c5a4
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Haynes Mathew George [Fri, 12 Dec 2014 20:21:30 +0000 (20:21 +0000)]
am
5c8b899d: am
2cbdfa9c: usbaudio: reset profile on device disconnect
* commit '
5c8b899d7c80f012599b984143cb31334ee61372':
usbaudio: reset profile on device disconnect
Haynes Mathew George [Fri, 12 Dec 2014 14:39:15 +0000 (14:39 +0000)]
am
2cbdfa9c: usbaudio: reset profile on device disconnect
* commit '
2cbdfa9c991fc63f52f48831e5509fcc2889db77':
usbaudio: reset profile on device disconnect
Haynes Mathew George [Wed, 3 Dec 2014 22:51:49 +0000 (14:51 -0800)]
usbaudio: reset profile on device disconnect
Reset ALSA device profile on disconnect event. Entries like
supported sample rates, channel counts, formats will be repopulated
on next connect.
CRs-Fixed: 765434
Change-Id: I27d3b7fd7ff22646996f58c53de08547b1a1fb6a
Bug:
18606219
Jean-Michel Trivi [Wed, 10 Dec 2014 22:42:18 +0000 (22:42 +0000)]
am
de148628: am
257fde6e: Reroute submix HAL: fix race condition on output state
* commit '
de148628b9850492fad26c801d0eb663d14400cb':
Reroute submix HAL: fix race condition on output state
Jean-Michel Trivi [Wed, 10 Dec 2014 22:36:20 +0000 (22:36 +0000)]
am
257fde6e: Reroute submix HAL: fix race condition on output state
* commit '
257fde6eb533b890776c8c45be8b61c48ab04945':
Reroute submix HAL: fix race condition on output state
Jean-Michel Trivi [Wed, 10 Dec 2014 04:20:15 +0000 (20:20 -0800)]
Reroute submix HAL: fix race condition on output state
When reading from a pipe, the output may have been previously
closed, therefore the output state should only be read if it
is still available.
This fixes a race condition observed between in_read() (which
accesses the output stream) and adev_close_output_stream()
(which sets the output reference to NULL).
No issue with out_write() which checks the input reference.
Bug
16009464
Change-Id: I979bc12c8fe91fad9b6f6c9e0be107c1bacae360
Elliott Hughes [Fri, 5 Dec 2014 18:25:18 +0000 (18:25 +0000)]
am
c5f5daff: am
719b8423: Merge "Remove ARCH_X86."
* commit '
c5f5daffb520017f2d6d99d245866b448723c876':
Remove ARCH_X86.
Elliott Hughes [Fri, 5 Dec 2014 18:01:52 +0000 (18:01 +0000)]
am
719b8423: Merge "Remove ARCH_X86."
* commit '
719b8423102e469b5a537321f02011415b376dbe':
Remove ARCH_X86.
Elliott Hughes [Fri, 5 Dec 2014 17:47:28 +0000 (17:47 +0000)]
Merge "Remove ARCH_X86."
Elliott Hughes [Fri, 5 Dec 2014 00:20:52 +0000 (16:20 -0800)]
Remove ARCH_X86.
Should have been __GLIBC__, but the code is dead anyway.
Change-Id: I773f296a9c31949fa631cad863b841584c71f0ef
Kenny Root [Fri, 5 Dec 2014 00:16:02 +0000 (00:16 +0000)]
am
c18a034e: am
47c0fcd0: Merge "initialization of defined variables"
* commit '
c18a034e1654f3c6dfbb73212630465c33f0a07e':
initialization of defined variables
Kenny Root [Thu, 4 Dec 2014 23:37:34 +0000 (23:37 +0000)]
am
47c0fcd0: Merge "initialization of defined variables"
* commit '
47c0fcd0841764a50d05e1fa4831f3002258ae22':
initialization of defined variables
Kenny Root [Thu, 4 Dec 2014 23:25:46 +0000 (23:25 +0000)]
Merge "initialization of defined variables"
Andre Eisenbach [Tue, 2 Dec 2014 08:20:35 +0000 (08:20 +0000)]
am
34a93da9: am
285fed09: Add server-side callback for change in MTU (1/4)
* commit '
34a93da9bab2e9a1a56a2b9d7ce664c172e2e041':
Add server-side callback for change in MTU (1/4)
Andre Eisenbach [Tue, 2 Dec 2014 08:14:05 +0000 (08:14 +0000)]
am
285fed09: Add server-side callback for change in MTU (1/4)
* commit '
285fed09639f66923529289d71cc633ad738c96c':
Add server-side callback for change in MTU (1/4)
Dan Albert [Fri, 28 Nov 2014 06:09:05 +0000 (06:09 +0000)]
am
df44fe72: am
32fb8b2d: Merge "Fix C++11 build."
* commit '
df44fe72a6a9d163bb23a0808cf74241006600b0':
Fix C++11 build.
Dan Albert [Fri, 28 Nov 2014 06:05:03 +0000 (06:05 +0000)]
am
32fb8b2d: Merge "Fix C++11 build."
* commit '
32fb8b2d9f8399a745a26dddc031cc16867ada2d':
Fix C++11 build.
Dan Albert [Fri, 28 Nov 2014 05:54:35 +0000 (05:54 +0000)]
Merge "Fix C++11 build."
Dan Albert [Fri, 28 Nov 2014 05:39:46 +0000 (21:39 -0800)]
Fix C++11 build.
Not sure how this slipped past my checkbuild...
Change-Id: Id238887a2a47ced387a6128a772fad3e468096be
Andre Eisenbach [Wed, 26 Nov 2014 20:56:23 +0000 (12:56 -0800)]
Add server-side callback for change in MTU (1/4)
When a client requests to update the LE transport MTU, the server
currently does not get notified and can therefor not properly size
notifications appropriate to the current MTU.
Bug:
18388114
Change-Id: I136f32cba48da3302e13fb9a9ec81b8e01712138
Dan Albert [Thu, 20 Nov 2014 23:05:06 +0000 (23:05 +0000)]
am
9d018618: am
58afe329: Merge "Use an older C++ standard."
* commit '
9d018618c4a467ed19ce96c04d6fe13fd125fcba':
Use an older C++ standard.
Dan Albert [Thu, 20 Nov 2014 23:00:38 +0000 (23:00 +0000)]
am
58afe329: Merge "Use an older C++ standard."
* commit '
58afe329533dc60618186f414d945829706ed772':
Use an older C++ standard.
Dan Albert [Thu, 20 Nov 2014 21:14:29 +0000 (21:14 +0000)]
Merge "Use an older C++ standard."
Dan Albert [Thu, 20 Nov 2014 19:23:35 +0000 (11:23 -0800)]
Use an older C++ standard.
Bug:
18466763
Change-Id: Ibea0eb2617f13bacca0a662fe4ca88fc8a168cd7
Jean-Michel Trivi [Wed, 19 Nov 2014 19:36:28 +0000 (19:36 +0000)]
am
59134344: am
b73bc860: Support multiple pipes for rerouting
* commit '
591343449a2bfd7ec33bfcbc27e55e1c1c71c5a7':
Support multiple pipes for rerouting
Jean-Michel Trivi [Wed, 19 Nov 2014 19:32:18 +0000 (19:32 +0000)]
am
b73bc860: Support multiple pipes for rerouting
* commit '
b73bc86089b8a65da88776bafcf48529431150b8':
Support multiple pipes for rerouting
Jean-Michel Trivi [Fri, 14 Nov 2014 17:05:20 +0000 (09:05 -0800)]
Support multiple pipes for rerouting
The implementation for "remote submix" supported only one pipe
to capture the output of a mix.
This CL adds support for multiple pipes to support capturing
multiple audio routes.
The structure for the r_submix audio device holds an array
of route configurations (route_config), each referencing
the input and output of the pipe dedicated to this route.
Each route is associated to a unique address. Standby
status is maintained per stream.
Bug
16009464
Change-Id: Ie164c4ad2a6d8138f825484e7faf29a974ccf82e
Dan Albert [Mon, 17 Nov 2014 23:07:38 +0000 (23:07 +0000)]
am
be9083bd: am
40d48e17: Merge "Stop using stlport."
* commit '
be9083bd65a9dc2f91bb1e512e15ead120f508c3':
Stop using stlport.
Dan Albert [Mon, 17 Nov 2014 22:58:58 +0000 (22:58 +0000)]
am
40d48e17: Merge "Stop using stlport."
* commit '
40d48e177f243c6093a45301db122a0475cc1124':
Stop using stlport.
Dan Albert [Mon, 17 Nov 2014 22:27:34 +0000 (22:27 +0000)]
Merge "Stop using stlport."
Dan Albert [Mon, 17 Nov 2014 22:21:50 +0000 (14:21 -0800)]
Stop using stlport.
Bug:
15193147
Change-Id: I5d53338f239ba18a2b007b345ba050d1560220b4
Dan Stoza [Fri, 7 Nov 2014 20:09:39 +0000 (20:09 +0000)]
am
1497e7e7: am
e0e834e3: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
* commit '
1497e7e76784c01043cf328177de076c70db6e86':
Add a BufferItem parameter to onFrameAvailable
Dan Stoza [Fri, 7 Nov 2014 20:03:42 +0000 (20:03 +0000)]
am
e0e834e3: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
* commit '
e0e834e3fe5561bf87aac7f88faaed39f0937a64':
Add a BufferItem parameter to onFrameAvailable
Dan Stoza [Fri, 7 Nov 2014 19:44:33 +0000 (19:44 +0000)]
Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
Yin-Chia Yeh [Fri, 7 Nov 2014 18:41:42 +0000 (18:41 +0000)]
am
3d31e157: am
8d3acf6e: Merge "Camera2/3 HAL test: cleanup deprecated keys" into lmp-mr1-dev
* commit '
3d31e157d0df55287aa53adabbaf6884fd12e911':
Camera2/3 HAL test: cleanup deprecated keys
Yin-Chia Yeh [Fri, 7 Nov 2014 18:35:40 +0000 (18:35 +0000)]
am
8d3acf6e: Merge "Camera2/3 HAL test: cleanup deprecated keys" into lmp-mr1-dev
* commit '
8d3acf6e6e58c392fcdc4913e49c6b1ded8117c8':
Camera2/3 HAL test: cleanup deprecated keys
OSDN Git Service
