Commit graph

1984 commits

Author SHA1 Message Date
Jinsuk Kim
1d1bf8b5f6 am 8b7eca86: CEC: Add a new flag for set_option
* commit '8b7eca867492d8a08285059492ce5697b68b5821':
  CEC: Add a new flag for set_option
2015-01-19 02:49:37 +00:00
Jinsuk Kim
8b7eca8674 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
2015-01-19 10:46:39 +09:00
Eric Laurent
e64994292c Merge commit '83b47a68' into manualmerge 2015-01-09 17:04:40 -08:00
Pavan Chikkala
83b47a6891 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
2015-01-09 14:14:41 -08:00
Eric Laurent
7e9abab194 am b338957d: Merge "usbaudio: Return 0 bytes on failure in capture"
* commit 'b338957d02528e5b51a15c5ce21e96fad4ff4a6f':
  usbaudio: Return 0 bytes on failure in capture
2015-01-09 17:58:33 +00:00
Eric Laurent
b338957d02 Merge "usbaudio: Return 0 bytes on failure in capture" 2015-01-09 17:49:31 +00:00
Viswanath L
8c7e1114a3 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
2015-01-09 22:38:54 +05:30
Elliott Hughes
06fcfc506c am 02e30945: Merge "Fix missing #includes in hardware/libhardware."
* commit '02e3094598ced8b05c9614d6070556d20328ef43':
  Fix missing #includes in hardware/libhardware.
2014-12-30 12:21:17 +00:00
Elliott Hughes
02e3094598 Merge "Fix missing #includes in hardware/libhardware." 2014-12-29 21:17:12 +00:00
Elliott Hughes
6cdd2b37d7 Fix missing #includes in hardware/libhardware.
Change-Id: If7c72054bf79b89c3d7a544956da671c3b404269
2014-12-29 12:59:11 -08:00
soon1.choi
7b30900df7 am 781bb3f7: DO NOT MERGE - fix: memory leak
* commit '781bb3f72e2706f07ee8bcc0c140201faf07c35c':
  DO NOT MERGE - fix: memory leak
2014-12-18 21:58:40 +00:00
Eric Laurent
68be24b1cc am ce0bbb97: Merge "fix: memory leak"
* commit 'ce0bbb97c12b712b75d0df42ce2f6e3f35d8db72':
  fix: memory leak
2014-12-18 21:50:36 +00:00
soon1.choi
781bb3f72e DO NOT MERGE - fix: memory leak
free momory for str_parms to prevent memory leak.

cherry-pcik from aosp c357157e28

Bug: 18798194.

Change-Id: I7df5567d665554dbd4646c881f0f48b0c568c5fe
2014-12-18 09:55:05 -08:00
Eric Laurent
ce0bbb97c1 Merge "fix: memory leak" 2014-12-18 16:42:11 +00:00
soon1.choi
c357157e28 fix: memory leak
free momory for str_parms to prevent memory leak.

Change-Id: I7df5567d665554dbd4646c881f0f48b0c568c5fe
2014-12-18 16:03:43 +09:00
Jinsuk Kim
981a952c5f 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
2014-12-17 21:24:45 +00:00
Jinsuk Kim
4b280b0cd0 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
2014-12-17 17:35:14 +09:00
Dan Albert
6bafdcb508 am 4f1fe2f5: Merge "Fix build in C++11 mode"
* commit '4f1fe2f59889d88ed026596c1841043db7edbc6f':
  Fix build in C++11 mode
2014-12-17 02:43:50 +00:00
Dan Albert
4f1fe2f598 Merge "Fix build in C++11 mode" 2014-12-17 02:29:27 +00:00
Ying Wang
14a4dd8907 am cecfb56c: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
* commit 'cecfb56c5192fe1517a8e1b5910f16961db4a231':
  Cleanup Obsolete LOCAL_PRELINK_MODULE.
2014-12-16 20:53:38 +00:00
Ying Wang
cecfb56c51 Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE." 2014-12-16 20:40:03 +00:00
Ying Wang
23853ead7d Cleanup Obsolete LOCAL_PRELINK_MODULE.
Bug: 18675947
Change-Id: I62157cd4bfab0edb445dd6543eb47a981e642848
2014-12-16 12:33:37 -08:00
Bernhard Rosenkränzer
1f1d79732f 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>
2014-12-12 22:16:55 +01:00
Haynes Mathew George
5c8b899d7c am 2cbdfa9c: usbaudio: reset profile on device disconnect
* commit '2cbdfa9c991fc63f52f48831e5509fcc2889db77':
  usbaudio: reset profile on device disconnect
2014-12-12 14:39:15 +00:00
Haynes Mathew George
2cbdfa9c99 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
2014-12-11 09:14:19 -08:00
Jean-Michel Trivi
de148628b9 am 257fde6e: Reroute submix HAL: fix race condition on output state
* commit '257fde6eb533b890776c8c45be8b61c48ab04945':
  Reroute submix HAL: fix race condition on output state
2014-12-10 22:36:20 +00:00
Jean-Michel Trivi
257fde6eb5 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
2014-12-09 20:27:11 -08:00
Elliott Hughes
c5f5daffb5 am 719b8423: Merge "Remove ARCH_X86."
* commit '719b8423102e469b5a537321f02011415b376dbe':
  Remove ARCH_X86.
2014-12-05 18:01:52 +00:00
Elliott Hughes
719b842310 Merge "Remove ARCH_X86." 2014-12-05 17:47:29 +00:00
Elliott Hughes
65d51a15a7 Remove ARCH_X86.
Should have been __GLIBC__, but the code is dead anyway.

Change-Id: I773f296a9c31949fa631cad863b841584c71f0ef
2014-12-04 16:20:52 -08:00
Kenny Root
c18a034e16 am 47c0fcd0: Merge "initialization of defined variables"
* commit '47c0fcd0841764a50d05e1fa4831f3002258ae22':
  initialization of defined variables
2014-12-04 23:37:34 +00:00
Kenny Root
47c0fcd084 Merge "initialization of defined variables" 2014-12-04 23:25:47 +00:00
Andre Eisenbach
34a93da9ba am 285fed09: Add server-side callback for change in MTU (1/4)
* commit '285fed09639f66923529289d71cc633ad738c96c':
  Add server-side callback for change in MTU (1/4)
2014-12-02 08:14:05 +00:00
Dan Albert
df44fe72a6 am 32fb8b2d: Merge "Fix C++11 build."
* commit '32fb8b2d9f8399a745a26dddc031cc16867ada2d':
  Fix C++11 build.
2014-11-28 06:05:03 +00:00
Dan Albert
32fb8b2d9f Merge "Fix C++11 build." 2014-11-28 05:54:36 +00:00
Dan Albert
9a8c57a346 Fix C++11 build.
Not sure how this slipped past my checkbuild...

Change-Id: Id238887a2a47ced387a6128a772fad3e468096be
2014-11-27 21:39:46 -08:00
Andre Eisenbach
285fed0963 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
2014-11-26 12:56:23 -08:00
Dan Albert
9d018618c4 am 58afe329: Merge "Use an older C++ standard."
* commit '58afe329533dc60618186f414d945829706ed772':
  Use an older C++ standard.
2014-11-20 23:00:38 +00:00
Dan Albert
58afe32953 Merge "Use an older C++ standard." 2014-11-20 21:14:30 +00:00
Dan Albert
e51237cda5 Use an older C++ standard.
Bug: 18466763
Change-Id: Ibea0eb2617f13bacca0a662fe4ca88fc8a168cd7
2014-11-20 21:14:12 +00:00
Jean-Michel Trivi
591343449a am b73bc860: Support multiple pipes for rerouting
* commit 'b73bc86089b8a65da88776bafcf48529431150b8':
  Support multiple pipes for rerouting
2014-11-19 19:32:18 +00:00
Jean-Michel Trivi
b73bc86089 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
2014-11-17 17:04:45 -08:00
Dan Albert
be9083bd65 am 40d48e17: Merge "Stop using stlport."
* commit '40d48e177f243c6093a45301db122a0475cc1124':
  Stop using stlport.
2014-11-17 22:58:58 +00:00
Dan Albert
40d48e177f Merge "Stop using stlport." 2014-11-17 22:27:35 +00:00
Dan Albert
6d604b127e Stop using stlport.
Bug: 15193147
Change-Id: I5d53338f239ba18a2b007b345ba050d1560220b4
2014-11-17 14:21:50 -08:00
Dan Stoza
1497e7e767 am e0e834e3: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
* commit 'e0e834e3fe5561bf87aac7f88faaed39f0937a64':
  Add a BufferItem parameter to onFrameAvailable
2014-11-07 20:03:42 +00:00
Dan Stoza
e0e834e3fe Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 2014-11-07 19:44:33 +00:00
Yin-Chia Yeh
3d31e157d0 am 8d3acf6e: Merge "Camera2/3 HAL test: cleanup deprecated keys" into lmp-mr1-dev
* commit '8d3acf6e6e58c392fcdc4913e49c6b1ded8117c8':
  Camera2/3 HAL test: cleanup deprecated keys
2014-11-07 18:35:40 +00:00
Yin-Chia Yeh
8d3acf6e6e Merge "Camera2/3 HAL test: cleanup deprecated keys" into lmp-mr1-dev 2014-11-07 18:23:01 +00:00
Daniel Estrada Alva
1bb4d46ccf am 700d2c2c: Merge "Fix typo and add more detailed comments on what we expect from GPS HAL. b/16727892" into lmp-mr1-dev
* commit '700d2c2cf512b1b2c167aa8a1841ea3ba5778279':
  Fix typo and add more detailed comments on what we expect from GPS HAL. b/16727892
2014-11-07 00:09:08 +00:00