OSDN Git Service
Eino-Ville Talvala [Wed, 17 Aug 2016 23:40:49 +0000 (23:40 +0000)]
resolve merge conflicts of
28ce9cd to lmp-dev am:
53d55d7834 am:
009bc279a2 am:
6f21973d99 am:
ab159ee14e am:
e0cb79f1bc am:
3197a71063 am:
ac2655b5cb am:
bf7bc974e5 am:
000c33c8eb
am:
95c7dd6db4
Change-Id: I2d98776730cbe9bb6feba8cb7ea67ec8b23ff012
Eino-Ville Talvala [Wed, 17 Aug 2016 23:34:48 +0000 (23:34 +0000)]
resolve merge conflicts of
28ce9cd to lmp-dev am:
53d55d7834 am:
009bc279a2 am:
6f21973d99 am:
ab159ee14e am:
e0cb79f1bc am:
3197a71063 am:
ac2655b5cb am:
bf7bc974e5
am:
000c33c8eb
Change-Id: I3f37f5d805a8e8f145d5ef0efcfe4bc27a07f8fe
Eino-Ville Talvala [Wed, 17 Aug 2016 23:31:47 +0000 (23:31 +0000)]
resolve merge conflicts of
28ce9cd to lmp-dev am:
53d55d7834 am:
009bc279a2 am:
6f21973d99 am:
ab159ee14e am:
e0cb79f1bc am:
3197a71063 am:
ac2655b5cb
am:
bf7bc974e5
Change-Id: I377dc993ede01f12a070ae01f4df0e90ac054ba4
Eino-Ville Talvala [Wed, 17 Aug 2016 23:28:47 +0000 (23:28 +0000)]
resolve merge conflicts of
28ce9cd to lmp-dev am:
53d55d7834 am:
009bc279a2 am:
6f21973d99 am:
ab159ee14e am:
e0cb79f1bc am:
3197a71063
am:
ac2655b5cb
Change-Id: I51396e87a67e735379249335e0c229f892db6412
Eino-Ville Talvala [Wed, 17 Aug 2016 23:25:48 +0000 (23:25 +0000)]
resolve merge conflicts of
28ce9cd to lmp-dev am:
53d55d7834 am:
009bc279a2 am:
6f21973d99 am:
ab159ee14e am:
e0cb79f1bc
am:
3197a71063
Change-Id: Id1f6192897346ce3c6b71c28c7143a6c0cce658d
Eino-Ville Talvala [Wed, 17 Aug 2016 23:22:50 +0000 (23:22 +0000)]
resolve merge conflicts of
28ce9cd to lmp-dev am:
53d55d7834 am:
009bc279a2 am:
6f21973d99 am:
ab159ee14e
am:
e0cb79f1bc
Change-Id: Ia82eb5aad072dc424a010b384019140ff05e792e
Eino-Ville Talvala [Wed, 17 Aug 2016 23:18:48 +0000 (23:18 +0000)]
resolve merge conflicts of
28ce9cd to lmp-dev am:
53d55d7834 am:
009bc279a2 am:
6f21973d99
am:
ab159ee14e
Change-Id: I34352f989484eeac66e4a87f51a2408b4fbf10b3
Eino-Ville Talvala [Wed, 17 Aug 2016 23:17:01 +0000 (23:17 +0000)]
resolve merge conflicts of
28ce9cd to lmp-dev am:
53d55d7834 am:
009bc279a2
am:
6f21973d99
Change-Id: I25bd8261bb5962ce12e5321156837e9ef8be06b2
Eino-Ville Talvala [Wed, 17 Aug 2016 23:10:19 +0000 (23:10 +0000)]
resolve merge conflicts of
28ce9cd to lmp-dev am:
53d55d7834
am:
009bc279a2
Change-Id: Ic3b18ebaaee959686e6ed29a1289fbcfb50de8de
Eino-Ville Talvala [Wed, 17 Aug 2016 23:06:15 +0000 (23:06 +0000)]
resolve merge conflicts of
28ce9cd to lmp-dev
am:
53d55d7834
Change-Id: If95d67bf8169f121f824639c7324f5470169e59e
Eino-Ville Talvala [Wed, 17 Aug 2016 21:30:39 +0000 (14:30 -0700)]
resolve merge conflicts of
28ce9cd to lmp-dev
Change-Id: I52e1077e21545b15a9b568a3c048580de99c8080
Eino-Ville Talvala [Wed, 17 Aug 2016 21:07:06 +0000 (21:07 +0000)]
Camera metadata: Check for inconsistent data count am:
241ff3e1ce
am:
59bc9e30bd
Change-Id: Ie09a5953eb7e44e45838306b2998f70541081499
Eino-Ville Talvala [Wed, 17 Aug 2016 21:04:06 +0000 (21:04 +0000)]
Camera metadata: Check for inconsistent data count
am:
241ff3e1ce
Change-Id: I780f5c31874d12a2d6e16c4658902e271f07ddcf
Eino-Ville Talvala [Wed, 17 Aug 2016 20:59:11 +0000 (20:59 +0000)]
Merge "Camera metadata: Check for inconsistent data count" into nyc-mr1-dev am:
29d15c5fe4
am:
63e39b7349
Change-Id: I718e57170d6fd97e2caf23b2523ae9ce0f1c4514
Eino-Ville Talvala [Wed, 17 Aug 2016 20:59:11 +0000 (20:59 +0000)]
Camera metadata: Check for inconsistent data count am:
4633133e74
am:
ffb23c2723
Change-Id: I9a11088c75b9a836b5bcfe1a3f138c51fbddce31
Chien-Yu Chen [Wed, 17 Aug 2016 20:59:10 +0000 (20:59 +0000)]
Camera: Prevent data size overflow am:
97a9cd6748 am:
5ccb5b43ec am:
4d15f88da3 am:
6ebb3d2a93 am:
6c1911e48b am:
40239912e1 am:
49f0bdca65 am:
e961e9eb2a am:
29afa93f4f am:
15c8ca5488 am:
0efacfef74 am:
61192805c0 am:
82dee6974a
am:
6bb40f36c4
Change-Id: I42259f0828a92878ac1e79d9900899d9102e48bf
Eino-Ville Talvala [Wed, 17 Aug 2016 20:01:33 +0000 (20:01 +0000)]
Merge "Camera metadata: Check for inconsistent data count" into nyc-mr1-dev
am:
29d15c5fe4
Change-Id: I0bdf4fc047fea5e497b03ecb3592f88b8145ee47
Eino-Ville Talvala [Wed, 17 Aug 2016 20:01:33 +0000 (20:01 +0000)]
Camera metadata: Check for inconsistent data count
am:
4633133e74
Change-Id: If20e5ca9dfca25ede12259ee3fcd3459df39a59e
Eino-Ville Talvala [Wed, 17 Aug 2016 19:58:46 +0000 (19:58 +0000)]
Merge "Camera metadata: Check for inconsistent data count" into nyc-mr1-dev
Eino-Ville Talvala [Tue, 16 Aug 2016 22:48:05 +0000 (15:48 -0700)]
Camera metadata: Check for inconsistent data count
Also check for overflow of data/entry count on append.
Bug:
30591838
Change-Id: Ibf4c3c6e236cdb28234f3125055d95ef0a2416a2
Chien-Yu Chen [Wed, 17 Aug 2016 19:11:37 +0000 (12:11 -0700)]
resolve merge conflicts of
17350b5 to nyc-mr1-dev-plus-aosp
Change-Id: Ic970fcd12be781414c6515dac35d11caf6ca9412
Chien-Yu Chen [Wed, 17 Aug 2016 18:58:27 +0000 (18:58 +0000)]
resolve merge conflicts of
6119280 to nyc-dev-plus-aosp
am:
945b07e5ff
Change-Id: Ia88a9ae2decffbf7b0bb9bd99743b4109e8dde51
Chien-Yu Chen [Wed, 17 Aug 2016 18:49:37 +0000 (11:49 -0700)]
resolve merge conflicts of
6119280 to nyc-dev-plus-aosp
Change-Id: Ic34242bf8423010eba0b8090e116911ef2d7b1b0
Chien-Yu Chen [Wed, 17 Aug 2016 18:13:54 +0000 (18:13 +0000)]
Camera: Prevent data size overflow am:
97a9cd6748 am:
5ccb5b43ec am:
4d15f88da3 am:
6ebb3d2a93 am:
6c1911e48b am:
40239912e1 am:
49f0bdca65 am:
e961e9eb2a am:
29afa93f4f am:
15c8ca5488 am:
0efacfef74 am:
61192805c0
am:
82dee6974a
Change-Id: Ia0a250d5b62f0a9761733a274346109df4044ca3
Chien-Yu Chen [Wed, 17 Aug 2016 18:13:53 +0000 (18:13 +0000)]
Camera: Prevent data size overflow
am:
62d8d87dd3
Change-Id: If61c045cf3629152f4ccef1c11e8be18d04e4233
Chien-Yu Chen [Wed, 17 Aug 2016 17:50:58 +0000 (17:50 +0000)]
Camera: Prevent data size overflow am:
97a9cd6748 am:
5ccb5b43ec am:
4d15f88da3 am:
6ebb3d2a93 am:
6c1911e48b am:
40239912e1 am:
49f0bdca65 am:
e961e9eb2a am:
29afa93f4f am:
15c8ca5488 am:
0efacfef74
am:
61192805c0
Change-Id: If57362340eb6662b6ff43e39de7f256450da08fb
Chien-Yu Chen [Wed, 17 Aug 2016 17:47:59 +0000 (17:47 +0000)]
Camera: Prevent data size overflow am:
97a9cd6748 am:
5ccb5b43ec am:
4d15f88da3 am:
6ebb3d2a93 am:
6c1911e48b am:
40239912e1 am:
49f0bdca65 am:
e961e9eb2a am:
29afa93f4f am:
15c8ca5488
am:
0efacfef74
Change-Id: If80efe9cfe79e980f1c7b3422e25e87f26e2d057
Chien-Yu Chen [Wed, 17 Aug 2016 17:44:36 +0000 (17:44 +0000)]
Camera: Prevent data size overflow am:
97a9cd6748 am:
5ccb5b43ec am:
4d15f88da3 am:
6ebb3d2a93 am:
6c1911e48b am:
40239912e1 am:
49f0bdca65 am:
e961e9eb2a am:
29afa93f4f
am:
15c8ca5488
Change-Id: I3ace8ead9bae0eef1e8e1a7815edb732dfa3ef3c
Chien-Yu Chen [Wed, 17 Aug 2016 17:41:54 +0000 (17:41 +0000)]
Camera: Prevent data size overflow am:
97a9cd6748 am:
5ccb5b43ec am:
4d15f88da3 am:
6ebb3d2a93 am:
6c1911e48b am:
40239912e1 am:
49f0bdca65 am:
e961e9eb2a
am:
29afa93f4f
Change-Id: Ibd99d91c9f03a9d6194845de3326c9b56093ad1b
Chien-Yu Chen [Wed, 17 Aug 2016 17:39:55 +0000 (17:39 +0000)]
Camera: Prevent data size overflow am:
97a9cd6748 am:
5ccb5b43ec am:
4d15f88da3 am:
6ebb3d2a93 am:
6c1911e48b am:
40239912e1 am:
49f0bdca65
am:
e961e9eb2a
Change-Id: I7754af66c50514f3bf97cbf31e3274f3274731a1
Chien-Yu Chen [Wed, 17 Aug 2016 17:35:21 +0000 (17:35 +0000)]
Camera: Prevent data size overflow am:
97a9cd6748 am:
5ccb5b43ec am:
4d15f88da3 am:
6ebb3d2a93 am:
6c1911e48b am:
40239912e1
am:
49f0bdca65
Change-Id: Ibc41693c4b37a010913bf63d6caea31c6345350d
Chien-Yu Chen [Wed, 17 Aug 2016 17:31:22 +0000 (17:31 +0000)]
Camera: Prevent data size overflow am:
97a9cd6748 am:
5ccb5b43ec am:
4d15f88da3 am:
6ebb3d2a93 am:
6c1911e48b
am:
40239912e1
Change-Id: I1866145d7ab1e6a03ce9504f5a872883a0259bc6
Chien-Yu Chen [Wed, 17 Aug 2016 00:10:54 +0000 (00:10 +0000)]
Camera: Prevent data size overflow am:
97a9cd6748 am:
5ccb5b43ec am:
4d15f88da3 am:
6ebb3d2a93
am:
6c1911e48b
Change-Id: I1399829b7532c142ce9352a096e2f73520fc38b5
Chien-Yu Chen [Wed, 17 Aug 2016 00:08:29 +0000 (00:08 +0000)]
Camera: Prevent data size overflow am:
97a9cd6748 am:
5ccb5b43ec am:
4d15f88da3
am:
6ebb3d2a93
Change-Id: I25af01fd5dd1ccada3105da84893e6ea7bff119b
Chien-Yu Chen [Wed, 17 Aug 2016 00:05:22 +0000 (00:05 +0000)]
Camera: Prevent data size overflow am:
97a9cd6748 am:
5ccb5b43ec
am:
4d15f88da3
Change-Id: I637b2009b6fb1c985c867ced35f4cadf0b7d21f9
Chien-Yu Chen [Wed, 17 Aug 2016 00:02:26 +0000 (00:02 +0000)]
Camera: Prevent data size overflow am:
97a9cd6748
am:
5ccb5b43ec
Change-Id: I3c828a810c29bc5a1f24bac2d6dfd59d9989f8f0
Chien-Yu Chen [Wed, 17 Aug 2016 00:01:16 +0000 (00:01 +0000)]
Camera: Prevent data size overflow
am:
97a9cd6748
Change-Id: I45dd85c5fb5e8066d4fe66f5f07bdfd8cd0d6789
Eino-Ville Talvala [Tue, 16 Aug 2016 22:48:05 +0000 (15:48 -0700)]
Camera metadata: Check for inconsistent data count
Also check for overflow of data/entry count on append.
Bug:
30591838
Change-Id: Ibf4c3c6e236cdb28234f3125055d95ef0a2416a2
Chien-Yu Chen [Fri, 12 Aug 2016 22:40:16 +0000 (15:40 -0700)]
Camera: Prevent data size overflow
Add a function to check overflow when calculating metadata
data size.
Bug:
30741779
Change-Id: I6405fe608567a4f4113674050f826f305ecae030
Chien-Yu Chen [Fri, 12 Aug 2016 22:40:16 +0000 (15:40 -0700)]
Camera: Prevent data size overflow
Add a function to check overflow when calculating metadata
data size.
Bug:
30741779
Change-Id: I6405fe608567a4f4113674050f826f305ecae030
Dan Albert [Fri, 12 Aug 2016 09:32:10 +0000 (09:32 +0000)]
Merge "Stop hard coding gtest things." am:
e88f053af9 am:
0b1d39ca63
am:
108cb03410
Change-Id: If4cf9f31c9105c48821977324b0576c55d74b629
Dan Albert [Fri, 12 Aug 2016 09:28:40 +0000 (09:28 +0000)]
Merge "Stop hard coding gtest things." am:
e88f053af9
am:
0b1d39ca63
Change-Id: Icf6d1fd7fbb3fffca800e05c3d13fbf3ad8300f9
Dan Albert [Fri, 12 Aug 2016 09:25:11 +0000 (09:25 +0000)]
Merge "Stop hard coding gtest things."
am:
e88f053af9
Change-Id: I08c0178d00681123834d6892424838ce00703146
Treehugger Robot [Fri, 12 Aug 2016 09:17:29 +0000 (09:17 +0000)]
Merge "Stop hard coding gtest things."
Dan Albert [Thu, 11 Aug 2016 19:55:23 +0000 (12:55 -0700)]
Stop hard coding gtest things.
The headers are exported.
Test: mma
Bug: None
Change-Id: I101460d87df19e9c1ad0a707a81852fee4c1f15f
Chih-Hung Hsieh [Fri, 29 Jul 2016 00:04:54 +0000 (00:04 +0000)]
Merge \\\"Fix clang-tidy performance warnings in audioservice.\\\" am:
d05ef1383d am:
2c345015a3
am:
243e2a0460
Change-Id: Ia3df4e0adc4581f2a2a248fd5776c241049a79a3
Chih-Hung Hsieh [Fri, 29 Jul 2016 00:02:24 +0000 (00:02 +0000)]
Merge \\"Fix clang-tidy performance warnings in audioservice.\\" am:
d05ef1383d
am:
2c345015a3
Change-Id: I9458d3756512011477321324d458eca903287309
Chih-Hung Hsieh [Thu, 28 Jul 2016 23:59:28 +0000 (23:59 +0000)]
Merge \"Fix clang-tidy performance warnings in audioservice.\"
am:
d05ef1383d
Change-Id: I14a426812e206b9e96a43c0ba50d7cf85b3684af
Treehugger Robot [Thu, 28 Jul 2016 23:46:00 +0000 (23:46 +0000)]
Merge "Fix clang-tidy performance warnings in audioservice."
Chih-Hung Hsieh [Wed, 27 Jul 2016 21:44:07 +0000 (14:44 -0700)]
Fix clang-tidy performance warnings in audioservice.
* Use const reference type for parameters and
for-loop index variables to avoid unnecessary copy.
Bug:
30407689
Bug:
30413223
Change-Id: Ie99f89ee67de9f2ace61f0971cd4a1820617f7d4
Test: build with WITH_TIDY=1
Chih-Hung Hsieh [Mon, 18 Jul 2016 18:09:18 +0000 (18:09 +0000)]
Merge \\\"Fix google-explicit-constructor warnings in system/media.\\\" am:
5522a916cd am:
465a9f5c1a
am:
b91f90ba9e
Change-Id: If6c1a273ef9ff5e4665ad2e1ebebcb02c84961f2
Chih-hung Hsieh [Mon, 18 Jul 2016 18:06:19 +0000 (18:06 +0000)]
Merge \\"Fix google-explicit-constructor warnings in system/media.\\" am:
5522a916cd
am:
465a9f5c1a
Change-Id: Iacb84484a44fed10eee1ec3c0a797b6e890d71be
Chih-Hung Hsieh [Mon, 18 Jul 2016 18:02:54 +0000 (18:02 +0000)]
Merge \"Fix google-explicit-constructor warnings in system/media.\"
am:
5522a916cd
Change-Id: I5c3a76f95c67b0585d2f59546c163087a1ffa5c8
Chih-hung Hsieh [Mon, 18 Jul 2016 17:49:37 +0000 (17:49 +0000)]
Merge "Fix google-explicit-constructor warnings in system/media."
Chih-Hung Hsieh [Tue, 12 Jul 2016 19:26:37 +0000 (12:26 -0700)]
Fix google-explicit-constructor warnings in system/media.
Declare explicit conversion constructors.
Bug:
28341362
Change-Id: I04ef1036731cd0d9d2d96b9dd9f111020b6b9ef5
Test: build with clang-tidy
Haynes Mathew George [Tue, 12 Jul 2016 17:30:44 +0000 (17:30 +0000)]
Merge \"audio_utils: Support more format conversions\" into nyc-mr1-dev
am:
712aefac45
Change-Id: I33d440be7a2f727a0df89c304ec3144eb6387b05
Glenn Kasten [Tue, 12 Jul 2016 17:20:26 +0000 (17:20 +0000)]
Merge "audio_utils: Support more format conversions" into nyc-mr1-dev
Glenn Kasten [Mon, 11 Jul 2016 22:29:29 +0000 (22:29 +0000)]
Merge \"Add host native build of primitives_test\" into nyc-mr1-dev
am:
9f212e587d
Change-Id: I1f854bb703f400e5648c8434a9a35ab7042e409b
Glenn Kasten [Mon, 11 Jul 2016 22:14:35 +0000 (22:14 +0000)]
Merge "Add host native build of primitives_test" into nyc-mr1-dev
Haynes Mathew George [Tue, 28 Jun 2016 20:52:18 +0000 (13:52 -0700)]
audio_utils: Support more format conversions
Support conversion from 32 bit pcm to 24 bit packed pcm.
Support conversion from 8_24 bit to 24 bit packed pcm.
Support conversion from 24 bit packed pcm to 32 bit pcm.
authored-by: Ashish Jain <ashishj@codeaurora.org>
Change-Id: I328ef6ed865f73e49be50ffa1b4e07e865df0339
Eric Laurent [Fri, 8 Jul 2016 23:13:20 +0000 (23:13 +0000)]
Add Dolby TrueHD audio format
am:
57a4158dc4
Change-Id: I354ffe72789aa861626beebee13f5026b52787f1
Glenn Kasten [Fri, 8 Jul 2016 21:10:33 +0000 (14:10 -0700)]
Add host native build of primitives_test
Change-Id: Ib3271c787363e63800cdf40984e2b345e0e4ed6e
Eric Laurent [Fri, 8 Jul 2016 01:53:19 +0000 (18:53 -0700)]
Add Dolby TrueHD audio format
Bug:
30024357
Change-Id: I2ca8d24e9b9b053a42e1bcf3802fdf866f82053d
Paul McLean [Tue, 14 Jun 2016 14:19:44 +0000 (14:19 +0000)]
Add a function to get a \"closest\" match to supported channel counts.
am:
eafa18a241
Change-Id: Ifbc524f90f9a3306759ba9b050bad30204e93bad
Paul McLean [Fri, 10 Jun 2016 17:47:43 +0000 (11:47 -0600)]
Add a function to get a "closest" match to supported channel counts.
Bug:
29154372
Change-Id: I5ac51eb2cb250b42fe638ec96e5dfff9425d67f6
Android Build Merger (Role) [Tue, 7 Jun 2016 22:39:50 +0000 (22:39 +0000)]
Merge "Merge \\"Camera: document expected timestamp source\\" into nyc-dev am:
8a22c41bf5 am:
62555f7360" into nyc-mr1-dev-plus-aosp
Yin-Chia Yeh [Tue, 7 Jun 2016 22:39:38 +0000 (22:39 +0000)]
Merge \\"Camera: document expected timestamp source\\" into nyc-dev am:
8a22c41bf5
am:
d7fc7c64c0
Change-Id: I1294117e0d102104dc5ee0748af646b265b12bfc
Yin-Chia Yeh [Tue, 7 Jun 2016 22:39:38 +0000 (22:39 +0000)]
Merge \\"Camera: document expected timestamp source\\" into nyc-dev am:
8a22c41bf5
am:
62555f7360
Change-Id: I730051c828125c8aac66410e2cc208f2ccaf8484
Yin-Chia Yeh [Tue, 7 Jun 2016 22:37:09 +0000 (22:37 +0000)]
Merge \"Camera: document expected timestamp source\" into nyc-dev
am:
8a22c41bf5
Change-Id: Iebce5b3330a010356892b68ed22b82e100fe9012
Yin-Chia Yeh [Tue, 7 Jun 2016 22:37:09 +0000 (22:37 +0000)]
Merge \"Camera: document expected timestamp source\" into nyc-dev
am:
8a22c41bf5
Change-Id: Iad645be722f64d13f58d34cd6aea2554785ee9fc
Yin-Chia Yeh [Tue, 7 Jun 2016 22:30:06 +0000 (22:30 +0000)]
Merge "Camera: document expected timestamp source" into nyc-dev
Yin-Chia Yeh [Mon, 6 Jun 2016 21:25:11 +0000 (14:25 -0700)]
Camera: document expected timestamp source
Bug:
29120073
Change-Id: Ia7aef33aaa0b05499e134f261b60d6a9969865e2
Android Build Merger (Role) [Fri, 3 Jun 2016 18:12:44 +0000 (18:12 +0000)]
Merge "Camera: Update lensShadingMap documentation and visibility am:
d089ee6902 am:
64a7a89d28" into nyc-mr1-dev-plus-aosp
Eino-Ville Talvala [Fri, 3 Jun 2016 18:10:15 +0000 (18:10 +0000)]
Camera: Update lensShadingMap documentation and visibility am:
d089ee6902
am:
64a7a89d28
* commit '
64a7a89d286a263af5565da947819ce64162c977':
Camera: Update lensShadingMap documentation and visibility
Change-Id: I507bf8c8cfc599f74e6540f3f7753b72caf99f0d
Eino-Ville Talvala [Fri, 3 Jun 2016 18:09:38 +0000 (18:09 +0000)]
Camera: Update lensShadingMap documentation and visibility am:
d089ee6902
am:
235c7c9d82
* commit '
235c7c9d82549f945a12e1d79c8da10e69dadbb2':
Camera: Update lensShadingMap documentation and visibility
Change-Id: I5f1dde2fbd8cdb949e58ad7ea86acf5394c612af
Eino-Ville Talvala [Fri, 3 Jun 2016 18:02:01 +0000 (18:02 +0000)]
Camera: Update lensShadingMap documentation and visibility
am:
d089ee6902
* commit '
d089ee6902fe06695c119368e05339f6ea2ad402':
Camera: Update lensShadingMap documentation and visibility
Change-Id: Ie83fd7a2cb1b20e6bf809128eb18f7faea706d1f
Eino-Ville Talvala [Fri, 3 Jun 2016 17:57:40 +0000 (17:57 +0000)]
Camera: Update lensShadingMap documentation and visibility
am:
d089ee6902
* commit '
d089ee6902fe06695c119368e05339f6ea2ad402':
Camera: Update lensShadingMap documentation and visibility
Change-Id: I44d0178be4fb7307d53dada3f00bcea526df9142
Eino-Ville Talvala [Thu, 2 Jun 2016 21:15:56 +0000 (14:15 -0700)]
Camera: Update lensShadingMap documentation and visibility
Revert added language about shading map being the full flat-field
correction; it's actually the same correction as applied to
camera device-processed data.
Remove the Java lens shading map key from the NDK, since it's a
duplicate of the underlying native key already in NDK.
Also fix a few other wording issues in the lens shading documentation.
Bug:
18175853
Change-Id: I227707671914eb17b0a0dd14655ea732aae2a6b7
Android Build Merger (Role) [Thu, 2 Jun 2016 18:21:20 +0000 (18:21 +0000)]
Merge "Camera: update NDK metadata tag documents am:
c9c2c6849c am:
a92f6c639f" into nyc-mr1-dev-plus-aosp
Yin-Chia Yeh [Thu, 2 Jun 2016 18:20:35 +0000 (18:20 +0000)]
Camera: update NDK metadata tag documents am:
c9c2c6849c
am:
a92f6c639f
* commit '
a92f6c639f06db39fcce5f635433e7bc4f36ff99':
Camera: update NDK metadata tag documents
Change-Id: I2e7825d8c9e704664b4605ce842f6c68ab820cf1
Yin-Chia Yeh [Thu, 2 Jun 2016 18:20:33 +0000 (18:20 +0000)]
Camera: update NDK metadata tag documents am:
c9c2c6849c
am:
68d560edf1
* commit '
68d560edf1c81e04ae83caa64614553f477d9583':
Camera: update NDK metadata tag documents
Change-Id: I97f548a8478208bff8b04b72daf65b2d11b8b61e
Yin-Chia Yeh [Thu, 2 Jun 2016 18:17:43 +0000 (18:17 +0000)]
Camera: update NDK metadata tag documents
am:
c9c2c6849c
* commit '
c9c2c6849c68ddb458d63b5f864ea76a8448a3d2':
Camera: update NDK metadata tag documents
Change-Id: I6aea7ab4dc20a26b43ca1df5b513731ecf4ff154
Yin-Chia Yeh [Thu, 2 Jun 2016 18:17:42 +0000 (18:17 +0000)]
Camera: update NDK metadata tag documents
am:
c9c2c6849c
* commit '
c9c2c6849c68ddb458d63b5f864ea76a8448a3d2':
Camera: update NDK metadata tag documents
Change-Id: I53ecb5decb20d735076684bc2a6bee23a20e0c8b
Paul McLean [Thu, 2 Jun 2016 16:01:42 +0000 (16:01 +0000)]
Add dump() (i.e dumpsys media.audio_flinger) functionality to USB HAL
am:
21b04ade57
* commit '
21b04ade57e5cbf33eff11f3f400f77eed5e2e75':
Add dump() (i.e dumpsys media.audio_flinger) functionality to USB HAL
Change-Id: Iced9c23f7a6743c2766d3a18032421d782722b46
Paul Mclean [Thu, 2 Jun 2016 15:24:04 +0000 (15:24 +0000)]
Revert "Adding dump functions to report state in dumpsys media.audio_flinger"
am:
2a3925e95a
* commit '
2a3925e95a9d4954be789dc4594233d4cc2d251c':
Revert "Adding dump functions to report state in dumpsys media.audio_flinger"
Change-Id: I85b3764111a005b117ccd569b808124adfe71907
Paul McLean [Wed, 25 May 2016 20:07:00 +0000 (14:07 -0600)]
Add dump() (i.e dumpsys media.audio_flinger) functionality to USB HAL
Bug:
28960293
Change-Id: Ice8a72b77ba00a816d12d2028b4ea5e7fe4bd319
Paul Mclean [Thu, 2 Jun 2016 14:48:10 +0000 (14:48 +0000)]
Revert "Adding dump functions to report state in dumpsys media.audio_flinger"
This reverts commit
b776eb3998732bc0278cce84c0ecfd1d91d5874f.
Change-Id: I7c0806abe5052afb46ca96d506cc5cadc79ee5fe
Yin-Chia Yeh [Wed, 25 May 2016 08:29:55 +0000 (01:29 -0700)]
Camera: update NDK metadata tag documents
- Create a separate ndk_metadata_properties.xml to convert java
API specific documents to NDK specific.
- Replace link to public SDK by NDK counterparts or hyperlink
to public SDK website.
- Disable markdown->html rendering on tables because doxygen
supports markdown syntax and does not support thead/tbody tag.
- Add descriptions to rectangle keys to specify their data
representation is (left, top, width, height)
Bug:
27102995
Change-Id: I6b6da019dde66f28fce72937f05bd984638ec2ba
Paul McLean [Tue, 31 May 2016 19:42:01 +0000 (19:42 +0000)]
Adding dump functions to report state in dumpsys media.audio_flinger
am:
b776eb3998
* commit '
b776eb3998732bc0278cce84c0ecfd1d91d5874f':
Adding dump functions to report state in dumpsys media.audio_flinger
Change-Id: Icb859bf4048ed4a122f6c60ce40c34f0f75b5562
Paul McLean [Wed, 11 May 2016 22:48:57 +0000 (16:48 -0600)]
Adding dump functions to report state in dumpsys media.audio_flinger
Change-Id: Icca1d817d56086f61290fc0a46aacd0c577752df
Luis Hector Chavez [Sat, 28 May 2016 00:07:23 +0000 (00:07 +0000)]
Merge "audioservice: Update libchrome APIs to r395517" am:
9b127ae22a am:
7fffdc5b8b
am:
d792635ff5
* commit '
d792635ff5a59b1b8a1f54e09ecc39a50269b2e2':
audioservice: Update libchrome APIs to r395517
Change-Id: I5be4cd8dd378d71a759612f7ea453694aeddfc72
Luis Hector Chavez [Fri, 27 May 2016 23:55:42 +0000 (23:55 +0000)]
Merge "audioservice: Update libchrome APIs to r395517" am:
9b127ae22a
am:
7fffdc5b8b
* commit '
7fffdc5b8bc9f22259e4eb0e95a66262a0facb3b':
audioservice: Update libchrome APIs to r395517
Change-Id: Id2d7ec727a1dbc0e412b55f26110cd82757bc3b4
Luis Hector Chavez [Fri, 27 May 2016 23:53:06 +0000 (23:53 +0000)]
Merge "audioservice: Update libchrome APIs to r395517"
am:
9b127ae22a
* commit '
9b127ae22ae21c2255981a55dd3ca538df7eb0e9':
audioservice: Update libchrome APIs to r395517
Change-Id: I3fb36ba147624b2e875977029ee30b1758b88fbf
Treehugger Robot [Fri, 27 May 2016 23:43:02 +0000 (23:43 +0000)]
Merge "audioservice: Update libchrome APIs to r395517"
Luis Hector Chavez [Sat, 21 May 2016 06:13:13 +0000 (23:13 -0700)]
audioservice: Update libchrome APIs to r395517
The new libchrome has been ported from Chromium and some APIs have
changed. Make necessary changes at call sites.
Change-Id: I8b1d18cd044009fd7a5889432296de159dc57edd
Elliott Hughes [Wed, 18 May 2016 15:40:09 +0000 (15:40 +0000)]
Merge "__ARM_ARCH__ is always >= 6." am:
236049f1b6 am:
1189f6f678
am:
ff4f9af68b
* commit '
ff4f9af68b0c1a770bed813e14444c6f2abeac75':
__ARM_ARCH__ is always >= 6.
Change-Id: Ia7d9ad174c3ff14c150a13393eaf7b262453d7c5
Elliott Hughes [Wed, 18 May 2016 15:34:44 +0000 (15:34 +0000)]
Merge "__ARM_ARCH__ is always >= 6." am:
236049f1b6
am:
1189f6f678
* commit '
1189f6f6788a5cb97f13c5ae7166dc802343c440':
__ARM_ARCH__ is always >= 6.
Change-Id: I6bb088ce56819a17b4ffa3c7925ac8ccc229368b
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