OSDN Git Service
Mikhail Naganov [Tue, 11 Oct 2016 00:20:51 +0000 (17:20 -0700)]
Remove redundant prefixes from enums in audio common types and effects HAL
Re-generated audio-base.h from updated files. No changes
in effective constant values, only in source mapping comments.
Bug:
31800672
Change-Id: I28ed14a0f5cfa53ada105258cd196fa86b401857
Test: make
Eric Laurent [Fri, 7 Oct 2016 01:36:52 +0000 (18:36 -0700)]
audio: add constants to audio-base.h
move some constants to audio-base.h to avoid double
definitions with audio::common::2_0::types.h
Change-Id: I6ef18a2fbb173ae183cf2cd07c9758b2efd57752
Colin Cross [Fri, 7 Oct 2016 00:10:37 +0000 (00:10 +0000)]
Merge "Removes gnu designated initializers." am:
594952f2a2 am:
e72d1d1206 am:
9e36579d55
am:
cb5d4c6038
Change-Id: Ibc603eaa5413040eb5bf090c21f88132836ba624
Colin Cross [Thu, 6 Oct 2016 23:46:28 +0000 (23:46 +0000)]
Merge "Removes gnu designated initializers." am:
594952f2a2 am:
e72d1d1206
am:
9e36579d55
Change-Id: I935317b76902e6f7554108d817226be32c5e87d8
Colin Cross [Thu, 6 Oct 2016 23:42:58 +0000 (23:42 +0000)]
Merge "Removes gnu designated initializers." am:
594952f2a2
am:
e72d1d1206
Change-Id: Ib38b93b0c35ec8c0ca7e452b283a4059b220e423
Colin Cross [Thu, 6 Oct 2016 23:39:33 +0000 (23:39 +0000)]
Merge "Removes gnu designated initializers."
am:
594952f2a2
Change-Id: I9b6cf8060c2725d00e61ae282c049a668b699c17
Colin Cross [Thu, 6 Oct 2016 23:36:34 +0000 (23:36 +0000)]
Merge "Removes gnu designated initializers."
Ryan Haining [Thu, 8 Sep 2016 01:04:33 +0000 (18:04 -0700)]
Removes gnu designated initializers.
C99 has the '.field = value' syntax, C++ has neither. The only ISO way
to write this is without designating.
Test: m -j
Bug:
31997134
Change-Id: I66d5c8ac65be379865018ac88b09020524293d99
Andreas Huber [Mon, 3 Oct 2016 19:59:12 +0000 (12:59 -0700)]
Audio constants are now automatically extracted from .hal interface
android.hardware.audio.common@2.0 and made available to system/audio.h through
auto-generated "audio-base.h".
Bug:
31800672
Change-Id: I515f97638b499c83cae98de335ed2be830ad22cf
Test: make
Glenn Kasten [Tue, 4 Oct 2016 22:58:05 +0000 (22:58 +0000)]
Merge "fifo: Add test for multi-process"
Dan Willemsen [Tue, 4 Oct 2016 02:22:51 +0000 (02:22 +0000)]
Merge "Convert to Android.bp" am:
e6be5fc431 am:
481030b1e2 am:
48dadcacc3
am:
e9988801e9
Change-Id: I17c32b5201c7edff637214f106ee8a390496d3f3
Dan Willemsen [Tue, 4 Oct 2016 02:20:52 +0000 (02:20 +0000)]
Merge "Convert to Android.bp" am:
e6be5fc431 am:
481030b1e2
am:
48dadcacc3
Change-Id: Ib90430a1bfd5f8a62907cc954a697b9827047a2e
Dan Willemsen [Tue, 4 Oct 2016 02:17:19 +0000 (02:17 +0000)]
Merge "Convert to Android.bp" am:
e6be5fc431
am:
481030b1e2
Change-Id: I0455356090a92249e669de99d7e963fa4268e0e8
Dan Willemsen [Tue, 4 Oct 2016 02:15:20 +0000 (02:15 +0000)]
Merge "Convert to Android.bp"
am:
e6be5fc431
Change-Id: I8bb50a33ec0a1213d37201f0fb6dc4390190d117
Dan Willemsen [Tue, 4 Oct 2016 02:09:59 +0000 (02:09 +0000)]
Merge "Convert to Android.bp"
Dan Willemsen [Thu, 22 Sep 2016 23:05:13 +0000 (16:05 -0700)]
Convert to Android.bp
See build/soong/README.md for more information.
Test: mma -j
Test: camera_metadata_test on flounder
Change-Id: I0f699a2a0d120783a5f543cf6d454109a5fc624b
Glenn Kasten [Mon, 12 Sep 2016 16:35:05 +0000 (09:35 -0700)]
fifo: Add test for multi-process
Test: this is it
Change-Id: Iea4f6ee9f7ec4e1a2e3d49f0065493796aaeed20
Glenn Kasten [Fri, 2 Sep 2016 20:54:59 +0000 (13:54 -0700)]
fifo: Add support for multi-process
For multi-process, the indices are allocated in separate shared memory.
This permits the buffer, write index, and throttling read index to each
have their own protection.
By default, the indices are allocated within the object to retain
API compatibility for the single-process case.
Test: in next CL
Change-Id: I5fae59169dbf73e8e38bf0eba0dcf907da2f8679
Colin Cross [Fri, 30 Sep 2016 04:32:40 +0000 (04:32 +0000)]
Merge "Update escaping in Android.bp files" am:
1bfae98559 am:
8fce0b19ee am:
8cd8d232d3
am:
d1b183b8c2
Change-Id: I1107003c146e023b95e6528b4e3cc1f090a24d0e
Colin Cross [Fri, 30 Sep 2016 04:27:00 +0000 (04:27 +0000)]
Merge "Update escaping in Android.bp files" am:
1bfae98559 am:
8fce0b19ee
am:
8cd8d232d3
Change-Id: I2f71c4c0296609caf48aa9a10a05154f5fa952d3
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
Zhijun He [Tue, 27 Sep 2016 22:26:53 +0000 (15:26 -0700)]
camera_metadata: cleanup dependency
camera_metadata doesn't depend on vendor tag header.
Bug:
30985004
Change-Id: Ib8939220801498a4427072b78efede7b08a7ffd3
rago [Tue, 20 Sep 2016 09:21:01 +0000 (09:21 +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 am:
b0b84bc962 am:
bfab6fae72 am:
4eb2a5da1d
am:
7dba99edcf
Change-Id: I949ec2eb379cf4f586e0c7f6190a6ef9e3c055a5
rago [Tue, 20 Sep 2016 08:13:33 +0000 (08:13 +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 am:
b0b84bc962 am:
bfab6fae72
am:
4eb2a5da1d
Change-Id: I7d08cfbf128556fa108ea6ad376f7cd10924cfc4
rago [Tue, 20 Sep 2016 07:15:42 +0000 (07:15 +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 am:
b0b84bc962
am:
bfab6fae72
Change-Id: Iff2f2afb8ad109b9dfdfa4e80dde7ab06bea485f
rago [Tue, 20 Sep 2016 06:51:45 +0000 (06:51 +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 am:
53c4169a75
am:
889c2d2231
Change-Id: I895cd36549acc2b95c42d01930477025ef87a261
rago [Tue, 20 Sep 2016 06:39:44 +0000 (06:39 +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
am:
53c4169a75
Change-Id: Id9194c967ebe648f523ce3dfc0918fd4ffeb2d56
rago [Tue, 20 Sep 2016 06:38:02 +0000 (06:38 +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
am:
b0b84bc962
Change-Id: I042fd15d5349c48f7c5aa9a97d31dc66c9380b93
rago [Tue, 20 Sep 2016 06:05:28 +0000 (06:05 +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: Ie6b3730caae23ff2d652475902d208f0db3063f5
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 04:34:12 +0000 (21:34 -0700)]
resolve merge conflicts of
1922726 to master
Change-Id: Ic5c6dd33569fbdae9e236fe2bf5bd30bea038cbf
Dan Willemsen [Tue, 13 Sep 2016 01:43:04 +0000 (18:43 -0700)]
resolve merge conflicts of
99b39aa to nyc-mr1-dev-plus-aosp
Change-Id: Ic05b48ec1ae8b1110c231d1bc28a0e05ff38ebc1
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
Ryan Haining [Thu, 8 Sep 2016 01:04:33 +0000 (18:04 -0700)]
Removes gnu designated initializers.
C99 has the '.field = value' syntax, C++ has neither. The only ISO way
to write this is without designating.
Change-Id: I66d5c8ac65be379865018ac88b09020524293d99
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)
rago [Tue, 23 Aug 2016 18:09:52 +0000 (11:09 -0700)]
Fix potential overflow in Visualizer effect
Bug:
30229821
Change-Id: Ia07041a5a149d7d3e120aa6ea0345fb86da37c9b
Eino-Ville Talvala [Thu, 18 Aug 2016 00:52:09 +0000 (00:52 +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:
220505e6fe am:
fc2cdc605b
am:
6c26438b34
Change-Id: If0237b95606d01f108a70eee7a59d9ac87eb17d9
Eino-Ville Talvala [Thu, 18 Aug 2016 00:52:08 +0000 (00:52 +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
am:
a8ff345be5
Change-Id: I7727c60a4d4a2b0d78f95b6940cac76637bd744b
Eino-Ville Talvala [Wed, 17 Aug 2016 23:43:34 +0000 (23:43 +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:
220505e6fe
am:
fc2cdc605b
Change-Id: I497fca7878c00aab9363f1d09f74375f5cac9ac4
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:37:48 +0000 (23:37 +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:
220505e6fe
Change-Id: I15906d44b27b3e7513dcee541f25a239dbe54d04
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: I5b4d1e7d07d2ebd5c2c488b3dd3d76e1dcb6d93a
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:20:29 +0000 (21:20 +0000)]
Merge "Camera metadata: Check for inconsistent data count" into nyc-mr1-dev am:
29d15c5fe4 am:
63e39b7349
am:
c11379c774
Change-Id: I7dc511cafccaa2cdcd491807f5f2e8cff755107e
Eino-Ville Talvala [Wed, 17 Aug 2016 21:20:28 +0000 (21:20 +0000)]
Camera metadata: Check for inconsistent data count am:
4633133e74 am:
ffb23c2723
am:
d8540a1810
Change-Id: If28ddefa1b0cd9ced4dcbf7002539db7e09a80de
Chien-Yu Chen [Wed, 17 Aug 2016 21:20:27 +0000 (21:20 +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
am:
45bfa5dfef
Change-Id: I5a2de8df483da04ccb3e78aa9b6126541df2e884
Chien-Yu Chen [Wed, 17 Aug 2016 21:20:27 +0000 (21:20 +0000)]
resolve merge conflicts of
17350b5 to nyc-mr1-dev-plus-aosp
am:
32310bc024
Change-Id: I49c3e6e13fdd5ca30d4be16d9fad0283987c4494
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
Chien-Yu Chen [Wed, 17 Aug 2016 19:32:56 +0000 (19:32 +0000)]
resolve merge conflicts of
6119280 to nyc-dev-plus-aosp am:
945b07e5ff
am:
fad58c8833
Change-Id: Ia74f8ed568e276d55baca27a3a04a88ec509d8c1
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
OSDN Git Service
