OSDN Git Service
Colin Cross [Fri, 30 Sep 2016 04:24:30 +0000 (04:24 +0000)]
Merge "Update escaping in Android.bp files" am:
1bfae98559
am:
8fce0b19ee
Change-Id: Idecdefd6e64c44e7496d17cad5d76113799df874
Colin Cross [Fri, 30 Sep 2016 04:21:33 +0000 (04:21 +0000)]
Merge "Update escaping in Android.bp files"
am:
1bfae98559
Change-Id: Iebdc04b6d38830c77f0b3e493b0a7f2487329804
Treehugger Robot [Fri, 30 Sep 2016 04:17:57 +0000 (04:17 +0000)]
Merge "Update escaping in Android.bp files"
Colin Cross [Thu, 29 Sep 2016 21:08:28 +0000 (14:08 -0700)]
Update escaping in Android.bp files
Strings like cflags in Android.bp files are parsed by blueprint,
written to build.ninja files, parsed by ninja, and then passed to
/bin/sh -c. This had resulted in a combination of blueprint
(\"), ninja ($$), and shell (\$) escaping being necessary.
Soong has been updated to automatically handle ninja and shell
escaping, remove extra escaping from Android.bp files.
Bug:
31221587
Test: m -j
Change-Id: Ib1deac0a236a2ad37fce394bbdefbf5a781a38a7
rago [Tue, 20 Sep 2016 06:04:58 +0000 (06:04 +0000)]
Fix potential overflow in Visualizer effect am:
7bbd500874 am:
99589ed96f am:
8682da681a am:
a5dddadec9 am:
960cba3e1b am:
902b06895f am:
af1e40957a am:
e1bc1ac318 am:
0fafbe88b5 am:
453066787b am:
1414a77d6a
am:
48309eb29c
Change-Id: I44be4c384bc84e9775c20e1ae6ac9574a025d7d1
rago [Tue, 20 Sep 2016 04:52:09 +0000 (04:52 +0000)]
Fix potential overflow in Visualizer effect am:
7bbd500874 am:
99589ed96f am:
8682da681a am:
a5dddadec9 am:
960cba3e1b am:
902b06895f am:
af1e40957a am:
e1bc1ac318 am:
0fafbe88b5 am:
453066787b
am:
1414a77d6a
Change-Id: I6247298111aca3a0e3a1cfb6996d23a11b1795b0
rago [Tue, 20 Sep 2016 04:33:42 +0000 (04:33 +0000)]
Fix potential overflow in Visualizer effect am:
7bbd500874 am:
99589ed96f am:
8682da681a am:
a5dddadec9 am:
960cba3e1b am:
902b06895f am:
af1e40957a am:
e1bc1ac318 am:
0fafbe88b5
am:
453066787b
Change-Id: I56ee2f6ae9366d1ec501a76519cab46cf3381046
rago [Tue, 20 Sep 2016 04:27:29 +0000 (04:27 +0000)]
Fix potential overflow in Visualizer effect am:
7bbd500874 am:
99589ed96f am:
8682da681a am:
a5dddadec9 am:
960cba3e1b am:
902b06895f am:
af1e40957a am:
e1bc1ac318
am:
0fafbe88b5
Change-Id: I6cdeb5b4234c5e6fcb2882ab7a778fa0894a28ed
rago [Tue, 20 Sep 2016 04:24:41 +0000 (04:24 +0000)]
Fix potential overflow in Visualizer effect am:
7bbd500874 am:
99589ed96f am:
8682da681a am:
a5dddadec9 am:
960cba3e1b am:
902b06895f am:
af1e40957a
am:
e1bc1ac318
Change-Id: Id679d6bcb437c23b4307eff166d3040ccf7aec48
rago [Tue, 20 Sep 2016 02:31:04 +0000 (02:31 +0000)]
Fix potential overflow in Visualizer effect am:
7bbd500874 am:
99589ed96f am:
8682da681a am:
a5dddadec9 am:
960cba3e1b am:
902b06895f
am:
af1e40957a
Change-Id: I574c3cf08bc48e3600321da4a00c21cb8bc32b09
rago [Tue, 20 Sep 2016 01:47:11 +0000 (01:47 +0000)]
Fix potential overflow in Visualizer effect am:
7bbd500874 am:
99589ed96f am:
8682da681a am:
a5dddadec9 am:
960cba3e1b
am:
902b06895f
Change-Id: If84ad0268c76e0113d235e9ab026d634cae9f138
rago [Tue, 20 Sep 2016 01:28:00 +0000 (01:28 +0000)]
Fix potential overflow in Visualizer effect am:
7bbd500874 am:
99589ed96f am:
8682da681a am:
a5dddadec9
am:
960cba3e1b
Change-Id: Ie001c2546d97cb913ad178427f5b283d58b80d38
rago [Tue, 20 Sep 2016 00:57:05 +0000 (00:57 +0000)]
Fix potential overflow in Visualizer effect am:
7bbd500874 am:
99589ed96f am:
8682da681a
am:
a5dddadec9
Change-Id: I8fcbe5c0edfab078d4b86b6b6dd08d7c36b4dc91
rago [Tue, 20 Sep 2016 00:46:12 +0000 (00:46 +0000)]
Fix potential overflow in Visualizer effect am:
7bbd500874 am:
99589ed96f
am:
8682da681a
Change-Id: I2393804a8d234f7374a9e65fc358e10b3c2a3a88
rago [Tue, 20 Sep 2016 00:39:51 +0000 (00:39 +0000)]
Fix potential overflow in Visualizer effect am:
7bbd500874
am:
99589ed96f
Change-Id: I99309d36b1db752ed86d2b3f13456cd4f0cd6be1
rago [Tue, 20 Sep 2016 00:35:06 +0000 (00:35 +0000)]
Fix potential overflow in Visualizer effect
am:
7bbd500874
Change-Id: I88bbbf8cfa578a86a692d75dd5a8cab00be0dcfc
Dan Willemsen [Tue, 13 Sep 2016 01:01:09 +0000 (01:01 +0000)]
Merge "Convert to Android.bp" am:
1cfc9bb140
am:
f8a26b926d
Change-Id: I33df472d5ceb70aba32e25b283e8e4ade33aa637
Dan Willemsen [Tue, 13 Sep 2016 00:58:08 +0000 (00:58 +0000)]
Merge "Convert to Android.bp"
am:
1cfc9bb140
Change-Id: Ic30d6d9bf11dcd5f581010d3d838aa4141fff593
Treehugger Robot [Tue, 13 Sep 2016 00:47:39 +0000 (00:47 +0000)]
Merge "Convert to Android.bp"
Dan Willemsen [Mon, 12 Sep 2016 23:15:40 +0000 (16:15 -0700)]
Convert to Android.bp
For more information about soong, see build/soong/README.md
Test: mma; Ran primitives_tests on flounder
Change-Id: I67db202775929e271a54c22d585f19cf6b1ef174
rago [Tue, 23 Aug 2016 18:09:52 +0000 (11:09 -0700)]
Fix potential overflow in Visualizer effect
Bug:
30229821
Change-Id: Ia07041a5a149d7d3e120aa6ea0345fb86da37c9b
(cherry picked from commit
b61dd321d08b21a5629044eca7f96e2ecd348e5f)
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 [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 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 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
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: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: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: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
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: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
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
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 [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
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: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
Chih-hung Hsieh [Mon, 16 May 2016 18:26:16 +0000 (18:26 +0000)]
Merge "Fix misc-macro-parentheses warnings." am:
73e30a2584
am:
94a926bedb
* commit '
94a926bedb5cd239bacec0e4ae32f97073600d3c':
Fix misc-macro-parentheses warnings.
Change-Id: If1524cbe5832eb2be931d8d1e02ce452acd54028
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."
Yin-Chia Yeh [Thu, 12 May 2016 19:34:23 +0000 (19:34 +0000)]
Camera: update ndk metadata tag template
am:
1d3e1a7583
* commit '
1d3e1a75837712a7c8953feabf6af9eec84dd296':
Camera: update ndk metadata tag template
Change-Id: I235ad26c99c1d147f74d50eed0c4af7f41cd3f74
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
Yin-Chia Yeh [Tue, 10 May 2016 22:03:21 +0000 (15:03 -0700)]
Camera: update ndk metadata tag template
to add doxygen tags.
Bug:
27102995
Change-Id: Id73b43124e1df84c408189b472082f8ef3d6873f
Ralph Nathan [Mon, 9 May 2016 19:48:25 +0000 (19:48 +0000)]
Merge changes Ia78f608c,I14dde521 am:
17b3b82b64
am:
48b84f79e8
* commit '
48b84f79e85dc0c9a293f4fe051177e935890d0c':
brillo: Add volume control to client library.
brillo: Add binder interfaces for volume control.
Change-Id: I10e642a8e7c00dbb208deee609e8652b35ce1347
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:36:22 +0000 (00:36 +0000)]
Merge "Stop hard coding gtest include path." am:
b7b0a8a5b4
am:
39ed48636e
* commit '
39ed48636ed58a0607c0702dd62b2945b7c354c3':
Stop hard coding gtest include path.
Change-Id: Idd9bdfd838dd09408f9e28fe7167119269c590b0
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
Yin-Chia Yeh [Thu, 28 Apr 2016 19:29:46 +0000 (19:29 +0000)]
Camera: update FPS range spec am:
206bf4d am:
386195f
am:
ea549f4e3f
* commit '
ea549f4e3fa14ed488b64743a7e9cea4b1077c4c':
Camera: update FPS range spec
Change-Id: I5a8e91a71b8ac4d0ea3370fa5193de3de08d42c1
Eino-Ville Talvala [Thu, 28 Apr 2016 19:29:45 +0000 (19:29 +0000)]
Camera: Documentation updates am:
62cfd97 am:
58b8e6e
am:
bf61f8aaaf
* commit '
bf61f8aaaf2aa15ede35bcfdd67d2db10186f638':
Camera: Documentation updates
Change-Id: Ideda4b074d10651c88489d2c9957299b0abb94fe
Jianing Wei [Thu, 28 Apr 2016 19:29:44 +0000 (19:29 +0000)]
Camera: update video stabilization API doc. am:
161c29c am:
569abce
am:
3c770fa86d
* commit '
3c770fa86d938d760f390705088dadb3cb81aada':
Camera: update video stabilization API doc.
Change-Id: I75328598902aeca837be9a158fcb708f4adc5f2b
Yin-Chia Yeh [Thu, 28 Apr 2016 17:30:07 +0000 (17:30 +0000)]
Camera: update FPS range spec am:
206bf4d
am:
386195f
* commit '
386195f42bc2ca44ae20fd0c5444036790f72acd':
Camera: update FPS range spec
Change-Id: I4d709e12091a364fc9877a7172c31057872841c3
Eino-Ville Talvala [Thu, 28 Apr 2016 17:30:07 +0000 (17:30 +0000)]
Camera: Documentation updates am:
62cfd97
am:
58b8e6e
* commit '
58b8e6e943da4e24daf3745a1b567cc99e241895':
Camera: Documentation updates
Change-Id: I1fa2d5f1d74ce703ab9d2bc10448acc10fb1998f
Jianing Wei [Thu, 28 Apr 2016 17:30:06 +0000 (17:30 +0000)]
Camera: update video stabilization API doc. am:
161c29c
am:
569abce
* commit '
569abcec45795c141c4883ac1939d44ee511d539':
Camera: update video stabilization API doc.
Change-Id: I72ecf216ead1017c525065bdc0d78955afc587da
Yin-Chia Yeh [Wed, 27 Apr 2016 21:10:34 +0000 (21:10 +0000)]
Camera: fix typo in dynamic black level
am:
ad1304d
* commit '
ad1304d32a8da0bd122bafd5a26f4bd0e6daec5f':
Camera: fix typo in dynamic black level
Change-Id: I151aae066e09019f24e98e6dd719c9e83ef4fee0
Yin-Chia Yeh [Tue, 26 Apr 2016 21:01:50 +0000 (14:01 -0700)]
Camera: fix typo in dynamic black level
Dynamic black level should be a capture result key.
Bug:
28276885
Change-Id: Ic70b64204251d046bc3ad17048b6a9c17ee9a174
Yin-Chia Yeh [Tue, 26 Apr 2016 14:46:04 +0000 (14:46 +0000)]
Camera: update FPS range spec
am:
206bf4d
* commit '
206bf4de57f9d85cfacbb8d919fd6960d3573be7':
Camera: update FPS range spec
Change-Id: I35dbe59718ce37ae39ca5a98a7c96443697f5592
Eino-Ville Talvala [Tue, 26 Apr 2016 14:46:04 +0000 (14:46 +0000)]
Camera: Documentation updates
am:
62cfd97
* commit '
62cfd97078f527b67a401ca4e5a97d33a16eacb5':
Camera: Documentation updates
Change-Id: Ica0dba21eafd0a71cb1fc2210243911e26e9a67b
Jianing Wei [Tue, 26 Apr 2016 14:46:03 +0000 (14:46 +0000)]
Camera: update video stabilization API doc.
am:
161c29c
* commit '
161c29c09f9c24f21d75f7e809b664b7a4cd39a3':
Camera: update video stabilization API doc.
Change-Id: Ib21db0fe442a450c937b13597fb21fda6e67f0b1
Elliott Hughes [Mon, 25 Apr 2016 15:04:42 +0000 (15:04 +0000)]
Merge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined (take two)." am:
80a9411
am:
9662b91
* commit '
9662b91edf0f1012dd90cce37a08f9d15ed6531e':
HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined (take two).
Change-Id: I539636ac04ea6d3f742b62e1ca24b9ee4533fb26
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