OSDN Git Service
Elliott Hughes [Wed, 18 May 2016 15:31:07 +0000 (15:31 +0000)]
Merge "__ARM_ARCH__ is always >= 6."
am:
236049f1b6
* commit '
236049f1b6a05fa31ccca01c64c6ccc81d61bdb1':
__ARM_ARCH__ is always >= 6.
Change-Id: Ia8439dbe6fd02f966aa9430e30b07cb6416e4b20
Elliott Hughes [Wed, 18 May 2016 15:19:40 +0000 (15:19 +0000)]
Merge "__ARM_ARCH__ is always >= 6."
Elliott Hughes [Tue, 17 May 2016 19:38:58 +0000 (12:38 -0700)]
__ARM_ARCH__ is always >= 6.
Bug: http://b/
18556103
Change-Id: Ib0945132f4d0c662dd3eebea91e0a781485e86ce
Chih-Hung Hsieh [Mon, 16 May 2016 18:24:00 +0000 (18:24 +0000)]
Merge "Fix misc-macro-parentheses warnings."
am:
73e30a2584
* commit '
73e30a2584522a45c00e9c497b4b2dd1eb3a8474':
Fix misc-macro-parentheses warnings.
Change-Id: Ibf95e3930b36d205c99f631033792124d8f715df
Chih-hung Hsieh [Mon, 16 May 2016 18:20:07 +0000 (18:20 +0000)]
Merge "Fix misc-macro-parentheses warnings."
Chih-Hung Hsieh [Wed, 11 May 2016 22:13:31 +0000 (15:13 -0700)]
Fix misc-macro-parentheses warnings.
Add parentheses around macro arguments used beside binary operators.
Bug:
28705665
Change-Id: Idccb673b6ffacb4c25980ac74b60f3d5d6c2b56f
Ralph Nathan [Mon, 9 May 2016 19:43:00 +0000 (19:43 +0000)]
Merge changes Ia78f608c,I14dde521
am:
17b3b82b64
* commit '
17b3b82b64aa780d4cae8e4104823307e8a512a4':
brillo: Add volume control to client library.
brillo: Add binder interfaces for volume control.
Change-Id: Ia3316a9aa31dde509b9a086f6da0dd527d3a20e4
Ralph Nathan [Mon, 9 May 2016 19:34:51 +0000 (19:34 +0000)]
Merge changes Ia78f608c,I14dde521
* changes:
brillo: Add volume control to client library.
brillo: Add binder interfaces for volume control.
Dan Albert [Sat, 7 May 2016 00:31:34 +0000 (00:31 +0000)]
Merge "Stop hard coding gtest include path."
am:
b7b0a8a5b4
* commit '
b7b0a8a5b4fa07655846a167e5f93cb2c2118f30':
Stop hard coding gtest include path.
Change-Id: I7bbcda326f0d621dc21a216884e64291a63aa9e3
Treehugger Robot [Sat, 7 May 2016 00:25:48 +0000 (00:25 +0000)]
Merge "Stop hard coding gtest include path."
Dan Albert [Thu, 3 Mar 2016 21:01:15 +0000 (13:01 -0800)]
Stop hard coding gtest include path.
BUILD_NATIVE_TEST handles gtest includes for you.
Bug: http://b/
16574165
Change-Id: Idfb9080612ac69a0e00d8108bb2ff9a0aa8135c4
Elliott Hughes [Mon, 25 Apr 2016 14:59:30 +0000 (14:59 +0000)]
Merge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined (take two)."
am:
80a9411
* commit '
80a9411784cebe01cf128001a68b1431a1e76b81':
HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined (take two).
Change-Id: I7c1024c2c69629f788475ab0fa348fafb4f68952
Elliott Hughes [Mon, 25 Apr 2016 14:51:17 +0000 (14:51 +0000)]
Merge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined (take two)."
Dan Albert [Fri, 22 Apr 2016 20:53:06 +0000 (20:53 +0000)]
Merge "Fix 64-bit build failure."
am:
aff3239
* commit '
aff32398affb154eb5c0cc9d0f84173e1752e9bf':
Fix 64-bit build failure.
Change-Id: Ic824d6bc63bac513cd8f59cc51b57ded7b51568e
Treehugger Robot [Fri, 22 Apr 2016 20:47:30 +0000 (20:47 +0000)]
Merge "Fix 64-bit build failure."
Dan Albert [Fri, 22 Apr 2016 19:54:06 +0000 (12:54 -0700)]
Fix 64-bit build failure.
This function takes an `unsigned int`, not a `size_t`.
Has been broken for about a day:
https://android-review.googlesource.com/#/c/216103/
TreeHugger didn't catch this because there's no 64-bit checkbuild
TreeHugger target (I'm trying to get this fixed, but there's concern
about additional load). The continuous build hasn't caught this
either because the 64-bit targets in aosp are not checkbuilds (aside
from mips64, which is still broken from the NDK update).
Change-Id: Ia30ebb02f33030ff8ac282f46e859a58b7fd041d
Elliott Hughes [Fri, 22 Apr 2016 18:33:34 +0000 (11:33 -0700)]
HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined (take two).
The previous patch was the opposite of what it should have been,
because I mistook #ifndef for #ifdef.
Bug: http://b/
28318937
Change-Id: Ic132f426de4dd0f6b7ef2f07cf63e432ec25c187
Elliott Hughes [Fri, 22 Apr 2016 18:19:44 +0000 (18:19 +0000)]
Merge "Revert "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined.""
am:
a56257c662
* commit '
a56257c6623240e7dd43b4aac51076890c07013e':
Revert "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined."
Change-Id: I7afcf14a914888fa6db154d500fedc3d6aeaac7f
Elliott Hughes [Fri, 22 Apr 2016 17:30:10 +0000 (17:30 +0000)]
Merge "Revert "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined.""
Elliott Hughes [Fri, 22 Apr 2016 17:29:55 +0000 (17:29 +0000)]
Revert "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined."
This reverts commit
f815f857b92629fb9dd6e81e201eea983fb0a4ed.
Change-Id: Iac490089fa548189e49626834aff7af155fc3acd
Ralph Nathan [Fri, 22 Apr 2016 17:13:48 +0000 (17:13 +0000)]
Merge "brillo: Add support for volume buttons."
am:
1a15d351fb
* commit '
1a15d351fb83e36669ec740b4ffca65f10f887ff':
brillo: Add support for volume buttons.
Change-Id: I4d48487698ce0dbe799417e35ea96db8d394861b
Treehugger Robot [Fri, 22 Apr 2016 16:47:49 +0000 (16:47 +0000)]
Merge "brillo: Add support for volume buttons."
Ralph Nathan [Mon, 18 Apr 2016 23:24:27 +0000 (16:24 -0700)]
brillo: Add volume control to client library.
BUG=
28246583
TEST=unittests
Change-Id: Ia78f608c8f01aaae5f284d23e34f673efb300aa3
Ralph Nathan [Fri, 15 Apr 2016 00:19:53 +0000 (17:19 -0700)]
brillo: Add binder interfaces for volume control.
Add binder interfaces for volume control to brilloaudioservice so the
client library can communicate to it.
BUG=
27976764
TEST=none
Change-Id: I14dde5215ffb3116ea4d5cedc7110dec0c9fb173
Elliott Hughes [Fri, 22 Apr 2016 15:22:01 +0000 (15:22 +0000)]
Merge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined."
am:
187db58e0e
* commit '
187db58e0e1ddd6cab6abeece53da3620bb55a43':
HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined.
Change-Id: Ia2ef0a66f1aed6ec206ec761da1ae0dce3512499
Elliott Hughes [Fri, 22 Apr 2016 15:15:29 +0000 (15:15 +0000)]
Merge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined."
Ralph Nathan [Thu, 21 Apr 2016 21:38:30 +0000 (21:38 +0000)]
Merge "brillo: Add tests for client library."
am:
d68b570d0b
* commit '
d68b570d0b246186fd74aaa98f92228843eec3fe':
brillo: Add tests for client library.
Change-Id: Ib0e7b7191fab21e30f2b007aad2d757554928606
Ralph Nathan [Thu, 21 Apr 2016 20:51:10 +0000 (20:51 +0000)]
Merge "brillo: Add tests for client library."
Elliott Hughes [Thu, 21 Apr 2016 20:39:46 +0000 (13:39 -0700)]
HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined.
So let's remove dead code to use a deprecated function that doesn't exist
in LP64.
Bug: http://b/
28318937
Change-Id: I6d4c36de1be88569df774144bcfbc4800561926a
Ralph Nathan [Mon, 21 Mar 2016 21:10:56 +0000 (14:10 -0700)]
brillo: Add support for volume buttons.
Add a handler to detect volume button presses and notify aps.
BUG=
27770812
TEST=unittests
Change-Id: Ia62ef8bbef0c0e2a6852e921828d5d62f4f73454
Ralph Nathan [Thu, 14 Apr 2016 21:28:02 +0000 (14:28 -0700)]
brillo: Add tests for client library.
This CL adds unit tests for for the brillo audio client and manager. It
also provides a mock for the brilloaudioservice.
BUG=
27844397
TEST=all unittests pass
Change-Id: Ieab85af69bd39a3d69d8ffc96cefabe5a2ab9df2
Ralph Nathan [Thu, 14 Apr 2016 19:27:58 +0000 (19:27 +0000)]
Merge "brillo: Remove client library to aps communication."
am:
9973061
* commit '
99730613078c8930a073eb5dfbd4dec8348545d6':
brillo: Remove client library to aps communication.
Change-Id: Ib093dbab765ccbb59d53c5af283e16c31f92e21e
Treehugger Robot [Thu, 14 Apr 2016 19:22:03 +0000 (19:22 +0000)]
Merge "brillo: Remove client library to aps communication."
Ralph Nathan [Mon, 11 Apr 2016 20:01:07 +0000 (13:01 -0700)]
brillo: Remove client library to aps communication.
The client library for brilloaudioservice should not communicate with
the audio policy service. It now communicates with the
brilloaudioservice which then calls the audio policy service.
BUG=
27945090,
27945589
TEST=none
Change-Id: Ie9a95f15dee5ac2625910a579ec72fbd27410af4
Ralph Nathan [Fri, 8 Apr 2016 21:12:44 +0000 (21:12 +0000)]
Merge "brillo: Add client library for brilloaudioservice."
am:
1247f05
* commit '
1247f05ba6f45cd6d9045c55745801e6c260c7d4':
brillo: Add client library for brilloaudioservice.
Change-Id: I1e8d1a36cb00389d5cf35a1767ec24f8551746f8
Ralph Nathan [Fri, 8 Apr 2016 20:54:25 +0000 (20:54 +0000)]
Merge "brillo: Add client library for brilloaudioservice."
Phil Burk [Fri, 8 Apr 2016 18:07:25 +0000 (18:07 +0000)]
Merge "SPDIF: Fix warnings from static analyser"
am:
19e3fee
* commit '
19e3fee37465d93cd545849355383ae9fb749f7f':
SPDIF: Fix warnings from static analyser
Change-Id: I47d0aedd7efdde88646ca4856cda32dfedd016d7
Chih-hung Hsieh [Fri, 8 Apr 2016 17:46:26 +0000 (17:46 +0000)]
Merge "SPDIF: Fix warnings from static analyser"
Phil Burk [Wed, 6 Apr 2016 21:54:46 +0000 (14:54 -0700)]
SPDIF: Fix warnings from static analyser
Bug:
27230467
Change-Id: I89013d8b6696c6491db655ff2e1a3ceee9ffa3c8
Signed-off-by: Phil Burk <philburk@google.com>
Ralph Nathan [Tue, 16 Feb 2016 17:48:29 +0000 (09:48 -0800)]
brillo: Add client library for brilloaudioservice.
Add a client library so that developers can talk to the Brillo audio
service. This CL provides support for device enumeration on Brillo.
BUG=
26938282
BUG=
26938132
TEST=unit tests
Change-Id: Id3f99f8511ea550f5691da623a0d3a796f00f9da
Jorge Lucangeli Obes [Fri, 18 Mar 2016 20:27:07 +0000 (20:27 +0000)]
Merge "audioservice: Fix spacing in error message."
Jorge Lucangeli Obes [Fri, 18 Mar 2016 20:20:02 +0000 (13:20 -0700)]
audioservice: Fix spacing in error message.
The current message looks weird:
[WARNING:audio_device_handler.cpp(98)] Kernel does not have wired headset support.
Could not open /sys/class/switch/h2w/state( FILE_ERROR_NOT_FOUND )
Notice the ( is not separated from the end of the filename.
Change to:
Could not open /sys/class/switch/h2w/state (FILE_ERROR_NOT_FOUND).
Which IMHO looks better.
Bug:
27743736
Change-Id: Ide7015b7c67702486955cf8406d6163d24729e63
Eric Laurent [Mon, 14 Mar 2016 16:03:13 +0000 (16:03 +0000)]
Merge "spdif: add support for type-2 e-ac3 streams"
Apratim Utkarsh [Mon, 7 Mar 2016 22:45:23 +0000 (22:45 +0000)]
Merge "alsa_utils: modify period size calculation"
am:
5f52f5c259
* commit '
5f52f5c259d0a988ee3e8a773468f829f4426d37':
alsa_utils: modify period size calculation
Glenn Kasten [Mon, 7 Mar 2016 22:31:00 +0000 (22:31 +0000)]
Merge "alsa_utils: modify period size calculation"
Apratim Utkarsh [Tue, 22 Dec 2015 10:47:07 +0000 (16:17 +0530)]
alsa_utils: modify period size calculation
Retrieve period duration from system property.
Also remove multiplier "2" used in min period size calculation.
To keep default USB audio behavior same increase default period
size to 10ms.
Change-Id: Ia55f4e4501edf824045cd062076e0770833c6540
Ashok Mudithanapalli [Mon, 11 Jan 2016 09:04:15 +0000 (14:34 +0530)]
spdif: add support for type-2 e-ac3 streams
Add support for E-AC3 streams which has AC3
coded substreams.
Change-Id: Idbe0e422172e6b4b017c5c7617cd5ff44cb725b0
Ralph Nathan [Mon, 29 Feb 2016 17:23:14 +0000 (17:23 +0000)]
Merge "brillo: Add binder interfaces to brilloaudioservice."
am:
fbc05586c7
* commit '
fbc05586c78f01c73a16c638d3ba8d0c9a392770':
brillo: Add binder interfaces to brilloaudioservice.
Ralph Nathan [Mon, 29 Feb 2016 17:20:28 +0000 (17:20 +0000)]
Merge "brillo: Add binder interfaces to brilloaudioservice."
Ralph Nathan [Tue, 2 Feb 2016 22:59:27 +0000 (14:59 -0800)]
brillo: Add binder interfaces to brilloaudioservice.
Expose binder interfaces to brilloaudioservice so clients can register
callbacks and communicate with the service.
BUG=
26938019
TEST=unittests + manual tests
Change-Id: I60e420b6110bfabb878bd2c2110acc136247b9a4
Jorge Lucangeli Obes [Thu, 25 Feb 2016 00:04:46 +0000 (00:04 +0000)]
Merge "Run \'brilloaudioservice\' as \'audioserver\' user."
am:
2676eea62c
* commit '
2676eea62c5ed1ea5b4e9249d98fd97f3c3bb065':
Run 'brilloaudioservice' as 'audioserver' user.
Jorge Lucangeli Obes [Wed, 24 Feb 2016 23:42:06 +0000 (23:42 +0000)]
Merge "Run 'brilloaudioservice' as 'audioserver' user."
Jorge Lucangeli Obes [Tue, 23 Feb 2016 01:43:44 +0000 (17:43 -0800)]
Run 'brilloaudioservice' as 'audioserver' user.
Android already includes an 'audioserver' user so reuse that user
instead of adding a new one. Nothing else in Brillo uses that user
(no pun intended.)
Bug:
27299198
Change-Id: I76764f6a5912dcb7f42879b2a85396420265f17a
Bill Yi [Wed, 17 Feb 2016 17:51:18 +0000 (09:51 -0800)]
Chih-hung Hsieh [Sat, 13 Feb 2016 00:13:16 +0000 (00:13 +0000)]
Merge "Fix false positive memory leak warning."
Chih-Hung Hsieh [Fri, 12 Feb 2016 22:52:46 +0000 (14:52 -0800)]
Fix false positive memory leak warning.
place_camera_metadata could return NULL only if buffer is NULL.
BUG:
27099839
Change-Id: I1f5c6c0b96e21d1b487a3c3bb0b550760d7ea5c6
Dan Albert [Fri, 12 Feb 2016 20:06:27 +0000 (20:06 +0000)]
Merge "Fix warnings in system/media/audio_utils."
Dan Albert [Wed, 3 Feb 2016 00:43:45 +0000 (16:43 -0800)]
Fix warnings in system/media/audio_utils.
* Disable unused-parameter warnings
* Use the right abs function
* %zu
Bug: http://b/
26936282
Change-Id: Ic5819df3b34c60a08be59ce7ba13be2ce9045374
Ralph Nathan [Fri, 5 Feb 2016 19:23:50 +0000 (19:23 +0000)]
Merge "Add an init.rc file for brilloaudioservice."
Ralph Nathan [Thu, 4 Feb 2016 19:10:43 +0000 (11:10 -0800)]
Add an init.rc file for brilloaudioservice.
Start brilloaudioservice on init.
BUG=
26954423
TEST=manual test
Change-Id: I425ad9e1cd71badfd951dc375118c38e94e64581
Dan Albert [Wed, 3 Feb 2016 02:23:07 +0000 (02:23 +0000)]
Merge "Fix warnings in system/media/camera."
Dan Albert [Tue, 2 Feb 2016 23:20:52 +0000 (15:20 -0800)]
Fix warnings in system/media/camera.
Bug: http://b/
26936282
Change-Id: Ibc4830838c471272ad25e78a0c1ea098175ac6cc
Ralph Nathan [Thu, 28 Jan 2016 21:51:16 +0000 (21:51 +0000)]
Merge "brillo: Add service to detect audio devices."
Ralph Nathan [Thu, 7 Jan 2016 23:10:32 +0000 (15:10 -0800)]
brillo: Add service to detect audio devices.
Add a native service to detect when audio devices are connected to the
headphone jack and inform the audio system.
BUG=
25981491
TEST=manual test on abox_edge + unittests
Change-Id: Ia1ac9efe3008d81b1445c3e471d9c47bb042d921
Eric Laurent [Wed, 20 Jan 2016 23:35:52 +0000 (23:35 +0000)]
Merge "Add multi-mic support for the noise suppression pre-processing effect"
Alex Luebs [Tue, 15 Dec 2015 05:33:45 +0000 (21:33 -0800)]
Add multi-mic support for the noise suppression pre-processing effect
Change-Id: Id0b5b72c039e4a35bc5b3d58d9ce0f5895f51170
Yin-Chia Yeh [Sat, 5 Dec 2015 00:20:09 +0000 (16:20 -0800)]
Camera: update FPS range spec am:
30bf75b88a
am:
137dfd45df
* commit '
137dfd45dfed5ba7176bfd6688b1ca3c447482db':
Camera: update FPS range spec
Yin-Chia Yeh [Sat, 5 Dec 2015 00:02:40 +0000 (16:02 -0800)]
Camera: update FPS range spec
am:
30bf75b88a
* commit '
30bf75b88a25a49fdd388fc3c5a77ecbdede2e24':
Camera: update FPS range spec
Yin-Chia Yeh [Fri, 20 Nov 2015 23:16:05 +0000 (15:16 -0800)]
Camera: update FPS range spec
Bug:
25427163
Change-Id: Id020b051f0ee082f9883f9a73fa3ac34540c0cfc
Eino-Ville Talvala [Thu, 12 Nov 2015 01:27:01 +0000 (01:27 +0000)]
Camera: Documentation updates am:
04292697a7
am:
ebfd7b869b
* commit '
ebfd7b869b931ddb2b3038ff4ee129a8d436e24e':
Camera: Documentation updates
Eino-Ville Talvala [Thu, 12 Nov 2015 01:11:01 +0000 (01:11 +0000)]
Camera: Documentation updates
am:
04292697a7
* commit '
04292697a7841d6e45e0355c9dc3ced3bbedc768':
Camera: Documentation updates
Eino-Ville Talvala [Mon, 9 Nov 2015 02:58:27 +0000 (18:58 -0800)]
Camera: Documentation updates
- Use preCorrectionActiveArray instead of activeArray
for one of the possible sizes for raw outputs.
Bug:
23908116
Change-Id: I5f7efb4e399f392b9442ad458335eb0b4777e35c
Bill Yi [Tue, 3 Nov 2015 23:34:19 +0000 (23:34 +0000)]
Bill Yi [Tue, 3 Nov 2015 22:30:41 +0000 (14:30 -0800)]
Gaurav Shah [Mon, 2 Nov 2015 22:29:52 +0000 (22:29 +0000)]
Merge "system/media: Add NOTICE and MODULE_LICENSE_* files" am:
280293d781
am:
c40280be63
* commit '
c40280be637e8b1fa13dc20c84edc6cc61e27853':
system/media: Add NOTICE and MODULE_LICENSE_* files
Gaurav Shah [Mon, 2 Nov 2015 22:27:03 +0000 (22:27 +0000)]
Merge "system/media: Add NOTICE and MODULE_LICENSE_* files"
am:
280293d781
* commit '
280293d781462aff867d92603787c15b222f0c33':
system/media: Add NOTICE and MODULE_LICENSE_* files
Gaurav Shah [Mon, 2 Nov 2015 22:21:34 +0000 (22:21 +0000)]
Merge "system/media: Add NOTICE and MODULE_LICENSE_* files"
Gaurav Shah [Fri, 2 Oct 2015 22:46:19 +0000 (15:46 -0700)]
system/media: Add NOTICE and MODULE_LICENSE_* files
BUG:
24604193
Change-Id: Ibaa4513028f876134d4bff970e69f708c2435d35
Andy Hung [Fri, 9 Oct 2015 16:28:57 +0000 (16:28 +0000)]
am
dce0eca3: fix usb audio for devices with more than 8 channels
* commit '
dce0eca34eab2016d6d11cb32f072db4079a4461':
fix usb audio for devices with more than 8 channels
Jianing Wei [Fri, 2 Oct 2015 02:29:21 +0000 (02:29 +0000)]
am
2d950898: Camera: update video stabilization API doc.
* commit '
2d950898d4dc311ecfd2b64ea8880656dd6a14fa':
Camera: update video stabilization API doc.
Andy Hung [Mon, 28 Sep 2015 23:31:54 +0000 (16:31 -0700)]
fix usb audio for devices with more than 8 channels
Use the lowest 8 channels.
Bug:
24468939
Change-Id: If116133ab3c902cc6d431b287058897c8e3af875
(cherry picked from commit
67c63b290460f36f7841d6f01017bb116a2a36f1)
Colin Cross [Thu, 1 Oct 2015 00:46:57 +0000 (00:46 +0000)]
am
209b49f9: am
24ba4816: Merge "Update libaudioutils for host"
* commit '
209b49f902ba6f4945c32720db65e359a5c43cd2':
Update libaudioutils for host
Colin Cross [Thu, 1 Oct 2015 00:38:57 +0000 (00:38 +0000)]
am
24ba4816: Merge "Update libaudioutils for host"
* commit '
24ba4816f378b0f87011ced509f873d437969760':
Update libaudioutils for host
Colin Cross [Thu, 1 Oct 2015 00:33:45 +0000 (00:33 +0000)]
Merge "Update libaudioutils for host"
Glenn Kasten [Wed, 14 Jan 2015 01:04:09 +0000 (17:04 -0800)]
Update libaudioutils for host
Change-Id: Ic10f786952dffc29e3ce0399cb72ce1cec4055e2
(cherry picked from commit
4504b3372c0979614e2abcc6b3fa463dcd4d141b)
Glenn Kasten [Wed, 30 Sep 2015 23:51:04 +0000 (23:51 +0000)]
am
14b65781: am
50382728: Merge "Fix Mac build"
* commit '
14b65781f2e13b19ca294c88052aafd84ad4ccdf':
Fix Mac build
Glenn Kasten [Wed, 30 Sep 2015 23:51:03 +0000 (23:51 +0000)]
am
5f125ab1: resolved conflicts for
dd82cb0f to stage-aosp-master
* commit '
5f125ab174f7d7a9e10a47f6af16cdd85c0253a7':
Add fifo_tests
Glenn Kasten [Wed, 30 Sep 2015 23:43:53 +0000 (23:43 +0000)]
am
50382728: Merge "Fix Mac build"
* commit '
503827280a2addfbc1215c891d80ce9258732e89':
Fix Mac build
Glenn Kasten [Wed, 30 Sep 2015 23:39:47 +0000 (16:39 -0700)]
resolved conflicts for
dd82cb0f to stage-aosp-master
Change-Id: I783e4dac71eb568fdd527399a95b270c0e6f7090
Glenn Kasten [Wed, 30 Sep 2015 21:49:26 +0000 (21:49 +0000)]
Merge "Fix Mac build"
Glenn Kasten [Wed, 30 Sep 2015 21:49:06 +0000 (21:49 +0000)]
Merge "Add fifo_tests"
Jim Miller [Sat, 6 Jun 2015 00:34:31 +0000 (17:34 -0700)]
Fix Mac build
ssize_t wasn't being picked because system headers weren't included
first.
Change-Id: I7748fedaa0c85ed9696e8ef77b0086ecf17ebe29
Glenn Kasten [Wed, 14 Jan 2015 00:25:39 +0000 (16:25 -0800)]
Add fifo_tests
Change-Id: I62a783bf551fd6c6c9e734b550f8bcc4e2a32df3
Jianing Wei [Tue, 29 Sep 2015 21:01:43 +0000 (14:01 -0700)]
Camera: update video stabilization API doc.
Update the video stabilization API description
to specify which scenarios guarantee stabilization
is performed if the control is set to ON and the
static metadata supports stabilization ON.
Bug:
23353979
Change-Id: I0f8662864e1c397c0a53edf11a685de2f6feb7f2
Eino-Ville Talvala [Sat, 19 Sep 2015 20:00:14 +0000 (20:00 +0000)]
am
563c5166: am
eac7b41c: Merge "camera: allow 0-sized metadata entries"
* commit '
563c5166f104621d97fbc17eb4b152182decb6b8':
camera: allow 0-sized metadata entries
Eino-Ville Talvala [Sat, 19 Sep 2015 19:52:20 +0000 (19:52 +0000)]
am
eac7b41c: Merge "camera: allow 0-sized metadata entries"
* commit '
eac7b41cd6929deab56f2cf9e4e918be75bf826c':
camera: allow 0-sized metadata entries
Eino-Ville Talvala [Fri, 18 Sep 2015 21:04:17 +0000 (21:04 +0000)]
Merge "camera: allow 0-sized metadata entries"
David Schalig [Sun, 15 Jun 2014 18:22:50 +0000 (11:22 -0700)]
camera: allow 0-sized metadata entries
0-sized metadata entries were rejected in
update_camera_metadata_entry() when the data pointer
was NULL, but accepted when it was not NULL.
This prevents return of empty array-type camera properties,
which is a valid case for some dynamic properties, e.g.
number of detected face rectangles.
Change-Id: I4e69d889fb416fd256a81e877f3a5aa43c253796
Signed-off-by: David Schalig <dschalig@nvidia.com>
Eino-Ville Talvala [Thu, 27 Aug 2015 12:20:58 +0000 (12:20 +0000)]
am
c3b3e366: (-s ours) am
c572dfc4: Camera: Fix spelling of quaternion, fix metadata ordering issue
* commit '
c3b3e366b86aa7e16693d67b1ebe955c46b3c067':
Glenn Kasten [Thu, 27 Aug 2015 12:20:57 +0000 (12:20 +0000)]
am
1431a49a: (-s ours) am
80f17ac6: Merge "Add USB proxy_get_presentation_position() for timestamps" into mnc-dev
* commit '
1431a49ab0a78e321564d7d0955069fb773c7a49':