OSDN Git Service
Eino-Ville Talvala [Thu, 2 Feb 2017 23:59:31 +0000 (23:59 +0000)]
CameraBase: Don't return an sp<> by reference am:
f86177dd93 am:
e1bdaa8fb1 am:
6cb1912505
am:
4f95157295
Change-Id: I25e6c61da37ba8efa681777ea7e11af7caf3f324
Eino-Ville Talvala [Thu, 2 Feb 2017 23:53:02 +0000 (23:53 +0000)]
CameraBase: Don't return an sp<> by reference am:
f86177dd93 am:
e1bdaa8fb1
am:
6cb1912505
Change-Id: If68d75e176ef8c2fafe2288307a0b0e724c3f826
Eino-Ville Talvala [Thu, 2 Feb 2017 23:49:01 +0000 (23:49 +0000)]
CameraBase: Don't return an sp<> by reference am:
f86177dd93
am:
e1bdaa8fb1
Change-Id: I1c48315fdff2a24d31d62d6aaa550f7d3a02bdde
Eino-Ville Talvala [Thu, 2 Feb 2017 23:47:01 +0000 (23:47 +0000)]
CameraBase: Don't return an sp<> by reference
am:
f86177dd93
Change-Id: I899d9c4b668171f6e68fdcfac9c7b973831a6a25
Marco Nelissen [Thu, 2 Feb 2017 21:56:22 +0000 (21:56 +0000)]
Revert "Turn off overflow protection for various math functions" am:
2dd1d5e02e am:
aa5498018f am:
ce9cab33b7 am:
4c1ad41c8b am:
bd91a6540d am:
08ccbcc16f am:
9070697124 am:
9986938f08 am:
245b572340 am:
d0bc460432 am:
4f34250af7 am:
96f48e1601 am:
1c4083fcbf
am:
878b27dfbb
Change-Id: I6de3a7463a661a7aa88716bee76d1e4e6a59e857
Marco Nelissen [Thu, 2 Feb 2017 21:54:22 +0000 (21:54 +0000)]
Revert "Turn off overflow protection for various math functions" am:
2dd1d5e02e am:
aa5498018f am:
ce9cab33b7 am:
4c1ad41c8b am:
bd91a6540d am:
08ccbcc16f am:
9070697124 am:
9986938f08 am:
245b572340 am:
d0bc460432 am:
4f34250af7 am:
96f48e1601
am:
1c4083fcbf
Change-Id: I192e8cc1e7e39fa8491ba0677e0a4108ff7931da
Marco Nelissen [Thu, 2 Feb 2017 21:51:23 +0000 (21:51 +0000)]
Revert "Turn off overflow protection for various math functions" am:
2dd1d5e02e am:
aa5498018f am:
ce9cab33b7 am:
4c1ad41c8b am:
bd91a6540d am:
08ccbcc16f am:
9070697124 am:
9986938f08 am:
245b572340 am:
d0bc460432 am:
4f34250af7
am:
96f48e1601
Change-Id: I153ab76b64a6ac5c3e7dbcb0ce24b3cfd32069e1
Marco Nelissen [Thu, 2 Feb 2017 21:48:52 +0000 (21:48 +0000)]
Revert "Turn off overflow protection for various math functions" am:
2dd1d5e02e am:
aa5498018f am:
ce9cab33b7 am:
4c1ad41c8b am:
bd91a6540d am:
08ccbcc16f am:
9070697124 am:
9986938f08 am:
245b572340 am:
d0bc460432
am:
4f34250af7
Change-Id: Ia17f05fa79c3205def123170a3cd815e34ed211c
Marco Nelissen [Thu, 2 Feb 2017 21:46:21 +0000 (21:46 +0000)]
Revert "Turn off overflow protection for various math functions" am:
2dd1d5e02e am:
aa5498018f am:
ce9cab33b7 am:
4c1ad41c8b am:
bd91a6540d am:
08ccbcc16f am:
9070697124 am:
9986938f08 am:
245b572340
am:
d0bc460432
Change-Id: I28693f257be18393f0d5711f33ca0eb9260cd361
Marco Nelissen [Thu, 2 Feb 2017 21:44:21 +0000 (21:44 +0000)]
Revert "Turn off overflow protection for various math functions" am:
2dd1d5e02e am:
aa5498018f am:
ce9cab33b7 am:
4c1ad41c8b am:
bd91a6540d am:
08ccbcc16f am:
9070697124 am:
9986938f08
am:
245b572340
Change-Id: I4a6bc9c420277062d46d57e734c77f67ae861ac4
Marco Nelissen [Thu, 2 Feb 2017 21:41:52 +0000 (21:41 +0000)]
Revert "Turn off overflow protection for various math functions" am:
2dd1d5e02e am:
aa5498018f am:
ce9cab33b7 am:
4c1ad41c8b am:
bd91a6540d am:
08ccbcc16f am:
9070697124
am:
9986938f08
Change-Id: I9d46125d775350691fd30b79fc3672212ab463d3
Marco Nelissen [Thu, 2 Feb 2017 21:38:51 +0000 (21:38 +0000)]
Revert "Turn off overflow protection for various math functions" am:
2dd1d5e02e am:
aa5498018f am:
ce9cab33b7 am:
4c1ad41c8b am:
bd91a6540d am:
08ccbcc16f
am:
9070697124
Change-Id: Icc7f1e5688d39f1ed4d4ea3bafa1474ec55090aa
Marco Nelissen [Thu, 2 Feb 2017 21:36:23 +0000 (21:36 +0000)]
Revert "Turn off overflow protection for various math functions" am:
2dd1d5e02e am:
aa5498018f am:
ce9cab33b7 am:
4c1ad41c8b am:
bd91a6540d
am:
08ccbcc16f
Change-Id: I7e920284bf69cc450d36f813e7e001ae30f656ee
Marco Nelissen [Thu, 2 Feb 2017 21:33:50 +0000 (21:33 +0000)]
Revert "Turn off overflow protection for various math functions" am:
2dd1d5e02e am:
aa5498018f am:
ce9cab33b7 am:
4c1ad41c8b
am:
bd91a6540d
Change-Id: Idafa3a702149b0dff4c8e6460a7ccfe342da1160
Marco Nelissen [Thu, 2 Feb 2017 21:31:21 +0000 (21:31 +0000)]
Revert "Turn off overflow protection for various math functions" am:
2dd1d5e02e am:
aa5498018f am:
ce9cab33b7
am:
4c1ad41c8b
Change-Id: I7a754e278cdc719a0bf6543f8a2accbc43301f86
Marco Nelissen [Thu, 2 Feb 2017 21:28:50 +0000 (21:28 +0000)]
Revert "Turn off overflow protection for various math functions" am:
2dd1d5e02e am:
aa5498018f
am:
ce9cab33b7
Change-Id: Id9318840db48994196c72eb5f14e132e23776bda
Marco Nelissen [Thu, 2 Feb 2017 21:26:19 +0000 (21:26 +0000)]
Revert "Turn off overflow protection for various math functions" am:
2dd1d5e02e
am:
aa5498018f
Change-Id: Ica9690b213037f6bd4c13bf14a4d66b77b7def41
Marco Nelissen [Thu, 2 Feb 2017 21:24:19 +0000 (21:24 +0000)]
Revert "Turn off overflow protection for various math functions"
am:
2dd1d5e02e
Change-Id: I37734de98f269e6886be0578b4ff9db31229c8de
Marco Nelissen [Thu, 2 Feb 2017 20:53:17 +0000 (20:53 +0000)]
Revert "Turn off overflow protection for various math functions"
This reverts commit
cbf5e6915c42c691a6ccb9a5d249e450f9e67467.
Change-Id: I0a81c26d22fee36485b21c285dcc91fbd518e1dd
Eino-Ville Talvala [Wed, 1 Feb 2017 23:27:41 +0000 (15:27 -0800)]
CameraBase: Don't return an sp<> by reference
If the server dies, the binder death callback clears out
the global camera service sp<>, and any current references to it
will become quite unhappy.
Test: Camera CTS passes
Bug:
31992879
Change-Id: I2966bed35d0319e3f26e3d4b1b8dc08006a22348
Marco Nelissen [Thu, 2 Feb 2017 20:02:55 +0000 (20:02 +0000)]
Turn off overflow protection for various math functions am:
cbf5e6915c am:
72b1fdbf49 am:
a25eb35608 am:
3d58f94eec am:
1edbc699b5 am:
c0118375e5 am:
ba78beef56 am:
b0ceb402c1 am:
e7a758e220 am:
350db71bea am:
d1cc28471a am:
1212f6e406 am:
415dfd3b95
am:
1c03bbb111
Change-Id: Ie7b08940fe2beda42093182ffd396828cc38b4b3
Marco Nelissen [Thu, 2 Feb 2017 20:00:27 +0000 (20:00 +0000)]
Turn off overflow protection for various math functions am:
cbf5e6915c am:
72b1fdbf49 am:
a25eb35608 am:
3d58f94eec am:
1edbc699b5 am:
c0118375e5 am:
ba78beef56 am:
b0ceb402c1 am:
e7a758e220 am:
350db71bea am:
d1cc28471a am:
1212f6e406
am:
415dfd3b95
Change-Id: I3303b8c60a94a6f31159012c13d2d6eed186981e
Marco Nelissen [Thu, 2 Feb 2017 19:58:24 +0000 (19:58 +0000)]
Turn off overflow protection for various math functions am:
cbf5e6915c am:
72b1fdbf49 am:
a25eb35608 am:
3d58f94eec am:
1edbc699b5 am:
c0118375e5 am:
ba78beef56 am:
b0ceb402c1 am:
e7a758e220 am:
350db71bea am:
d1cc28471a
am:
1212f6e406
Change-Id: I40f438d567d3972689705f1594bf17120b067284
Marco Nelissen [Thu, 2 Feb 2017 19:55:53 +0000 (19:55 +0000)]
Turn off overflow protection for various math functions am:
cbf5e6915c am:
72b1fdbf49 am:
a25eb35608 am:
3d58f94eec am:
1edbc699b5 am:
c0118375e5 am:
ba78beef56 am:
b0ceb402c1 am:
e7a758e220 am:
350db71bea
am:
d1cc28471a
Change-Id: Ice433e3bccd5b520941078f4369fec4b7d26e308
Marco Nelissen [Thu, 2 Feb 2017 19:53:54 +0000 (19:53 +0000)]
Turn off overflow protection for various math functions am:
cbf5e6915c am:
72b1fdbf49 am:
a25eb35608 am:
3d58f94eec am:
1edbc699b5 am:
c0118375e5 am:
ba78beef56 am:
b0ceb402c1 am:
e7a758e220
am:
350db71bea
Change-Id: I8d1260360f806a605831ac070d20da52696e3608
Marco Nelissen [Thu, 2 Feb 2017 19:50:55 +0000 (19:50 +0000)]
Turn off overflow protection for various math functions am:
cbf5e6915c am:
72b1fdbf49 am:
a25eb35608 am:
3d58f94eec am:
1edbc699b5 am:
c0118375e5 am:
ba78beef56 am:
b0ceb402c1
am:
e7a758e220
Change-Id: I2e348f157daa783988fe0690f9df3d922eff34b9
Marco Nelissen [Thu, 2 Feb 2017 19:49:37 +0000 (19:49 +0000)]
Turn off overflow protection for various math functions am:
cbf5e6915c am:
72b1fdbf49 am:
a25eb35608 am:
3d58f94eec am:
1edbc699b5 am:
c0118375e5 am:
ba78beef56
am:
b0ceb402c1
Change-Id: I3ac829f893058cec956296aeb6d2aab12a6ad758
Marco Nelissen [Thu, 2 Feb 2017 19:46:32 +0000 (19:46 +0000)]
Turn off overflow protection for various math functions am:
cbf5e6915c am:
72b1fdbf49 am:
a25eb35608 am:
3d58f94eec am:
1edbc699b5 am:
c0118375e5
am:
ba78beef56
Change-Id: I9c609d9a4032aca4806f3bf660722e98c7b7bd1b
Marco Nelissen [Thu, 2 Feb 2017 19:44:23 +0000 (19:44 +0000)]
Turn off overflow protection for various math functions am:
cbf5e6915c am:
72b1fdbf49 am:
a25eb35608 am:
3d58f94eec am:
1edbc699b5
am:
c0118375e5
Change-Id: Ie92b4cba6575ce1c01f96ac19d4b6cd79392a19c
Marco Nelissen [Thu, 2 Feb 2017 19:41:52 +0000 (19:41 +0000)]
Turn off overflow protection for various math functions am:
cbf5e6915c am:
72b1fdbf49 am:
a25eb35608 am:
3d58f94eec
am:
1edbc699b5
Change-Id: Ibcef66b9fa5eeffd3f77e3d6da5fea1556f36113
Marco Nelissen [Thu, 2 Feb 2017 19:39:34 +0000 (19:39 +0000)]
Turn off overflow protection for various math functions am:
cbf5e6915c am:
72b1fdbf49 am:
a25eb35608
am:
3d58f94eec
Change-Id: I6be57dc624b46c1517fab973f34dd98b7d808a28
Marco Nelissen [Thu, 2 Feb 2017 19:36:52 +0000 (19:36 +0000)]
Turn off overflow protection for various math functions am:
cbf5e6915c am:
72b1fdbf49
am:
a25eb35608
Change-Id: Ia0f2f794297ab8b4c5070e5948c748d0265aa54b
Marco Nelissen [Thu, 2 Feb 2017 19:34:21 +0000 (19:34 +0000)]
Turn off overflow protection for various math functions am:
cbf5e6915c
am:
72b1fdbf49
Change-Id: I46daf840866183690f27ff7b3e6ed7ffe8bec9f5
Marco Nelissen [Thu, 2 Feb 2017 19:31:52 +0000 (19:31 +0000)]
Turn off overflow protection for various math functions
am:
cbf5e6915c
Change-Id: Iee62ce7ef71208e30d9ee7b98342163bfc997779
Marco Nelissen [Wed, 1 Feb 2017 23:35:35 +0000 (15:35 -0800)]
Turn off overflow protection for various math functions
These functions also exist as arm assembly files, where the overflows
just wrap around, and this makes their plain C equivalents behave
the same.
Bug:
32577290
Bug:
33071964
Test: ran PoC for bug
32577290 using plain C source code
Change-Id: I73c2609589e7a89d36f6c44391548312259daf14
Andy Hung [Tue, 31 Jan 2017 01:44:03 +0000 (17:44 -0800)]
DO NOT MERGE Revert "Log audio information to ensure complete delivery"
This reverts commit
1f82f9569d257adc1d6d1c9a58e542c3c99c0109.
Robert Shih [Mon, 30 Jan 2017 20:08:14 +0000 (20:08 +0000)]
avc_utils: skip empty NALs from malformed bistreams am:
91fe76a157 am:
f79f26d257 am:
2b5d2c4a10 am:
b6e8b6b875 am:
e277181b71 am:
1a9f5250d8 am:
4bf710727b am:
5337437a1c am:
4fa55ddad0 am:
dda9763117
am:
e264868ea1
Change-Id: Ieded091275f27641193a285b0128845c30bfe60b
Robert Shih [Mon, 30 Jan 2017 20:05:42 +0000 (20:05 +0000)]
avc_utils: skip empty NALs from malformed bistreams am:
91fe76a157 am:
f79f26d257 am:
2b5d2c4a10 am:
b6e8b6b875 am:
e277181b71 am:
1a9f5250d8 am:
4bf710727b am:
5337437a1c am:
4fa55ddad0
am:
dda9763117
Change-Id: Ib87bc244d8add389cd40e7e6857811235a6ed234
Robert Shih [Mon, 30 Jan 2017 20:04:12 +0000 (20:04 +0000)]
avc_utils: skip empty NALs from malformed bistreams am:
91fe76a157 am:
f79f26d257 am:
2b5d2c4a10 am:
b6e8b6b875 am:
e277181b71 am:
1a9f5250d8 am:
4bf710727b am:
5337437a1c
am:
4fa55ddad0
Change-Id: Id43dff53b311aef4f5f24242f3278dffb111baa7
Robert Shih [Mon, 30 Jan 2017 20:01:42 +0000 (20:01 +0000)]
avc_utils: skip empty NALs from malformed bistreams am:
91fe76a157 am:
f79f26d257 am:
2b5d2c4a10 am:
b6e8b6b875 am:
e277181b71 am:
1a9f5250d8 am:
4bf710727b
am:
5337437a1c
Change-Id: Idf542feffe490329e52b91a4881bd37f6baed901
Robert Shih [Mon, 30 Jan 2017 19:59:13 +0000 (19:59 +0000)]
avc_utils: skip empty NALs from malformed bistreams am:
91fe76a157 am:
f79f26d257 am:
2b5d2c4a10 am:
b6e8b6b875 am:
e277181b71 am:
1a9f5250d8
am:
4bf710727b
Change-Id: Ic381f846d804f473dbb3bbb29041dd525806699f
Robert Shih [Mon, 30 Jan 2017 19:57:12 +0000 (19:57 +0000)]
avc_utils: skip empty NALs from malformed bistreams am:
91fe76a157 am:
f79f26d257 am:
2b5d2c4a10 am:
b6e8b6b875 am:
e277181b71
am:
1a9f5250d8
Change-Id: I3cb8cc1b6a7886333a17556f38656c93b96fc7f8
Robert Shih [Mon, 30 Jan 2017 19:54:43 +0000 (19:54 +0000)]
avc_utils: skip empty NALs from malformed bistreams am:
91fe76a157 am:
f79f26d257 am:
2b5d2c4a10 am:
b6e8b6b875
am:
e277181b71
Change-Id: I6870c07e169adaec88fd5eaa839d586dcf7aec5b
Robert Shih [Mon, 30 Jan 2017 19:52:11 +0000 (19:52 +0000)]
avc_utils: skip empty NALs from malformed bistreams am:
91fe76a157 am:
f79f26d257 am:
2b5d2c4a10
am:
b6e8b6b875
Change-Id: Icdc6674c87de89ceb06bea42fd9fc4525ba993ce
Robert Shih [Mon, 30 Jan 2017 19:50:10 +0000 (19:50 +0000)]
avc_utils: skip empty NALs from malformed bistreams am:
91fe76a157 am:
f79f26d257
am:
2b5d2c4a10
Change-Id: Idf43a017719d40c95e5a353985915ff80c02c0e2
Robert Shih [Mon, 30 Jan 2017 19:48:13 +0000 (19:48 +0000)]
avc_utils: skip empty NALs from malformed bistreams am:
91fe76a157
am:
f79f26d257
Change-Id: I25e94c3a8cf32c58a74a9af9afb8bc46a275543f
Robert Shih [Mon, 30 Jan 2017 19:46:10 +0000 (19:46 +0000)]
avc_utils: skip empty NALs from malformed bistreams
am:
91fe76a157
Change-Id: I4fc3e40dbfe2839611265ba178a9f35e05bcc28a
Robert Shih [Wed, 25 Jan 2017 02:08:59 +0000 (18:08 -0800)]
avc_utils: skip empty NALs from malformed bistreams
Avoid a CHECK and make it the decoder's repsonsibility to handle a
malformed bistream gracefully.
Bug:
34509901
Bug:
33137046
Test: StagefrightTest#testStagefright_bug_27855419_CVE_2016_2463
Change-Id: I2d94f8da63d65a86a9c711c45546e4c695e0f3b4
TreeHugger Robot [Wed, 18 Jan 2017 23:04:41 +0000 (23:04 +0000)]
Merge "Don't send short URB packet when sending MtpDataPacket." into nyc-mr2-dev
TreeHugger Robot [Wed, 18 Jan 2017 22:47:55 +0000 (22:47 +0000)]
Merge "Stop sending object handle with sendObject request." into nyc-mr2-dev
Eric Laurent [Wed, 18 Jan 2017 18:20:44 +0000 (18:20 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
7da83aadf4 am:
5717bb1acb -s ours am:
199484a558 am:
fff4a6aff9 am:
c8fbf1a97c am:
8e24a55a3c -s ours am:
76f5a383ea am:
6e300c3a99 am:
99b29882e4
am:
0b59c76959
Change-Id: I98c2edd3fb85dd9b10a22e7748ec1aa3eb9ba216
Eric Laurent [Wed, 18 Jan 2017 18:18:44 +0000 (18:18 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
7da83aadf4 am:
5717bb1acb -s ours am:
199484a558 am:
fff4a6aff9 am:
c8fbf1a97c am:
8e24a55a3c -s ours am:
76f5a383ea am:
6e300c3a99
am:
99b29882e4
Change-Id: Id8772818b52cbdd23e65f98c1e8ce3a26bede443
Eric Laurent [Wed, 18 Jan 2017 18:10:59 +0000 (18:10 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
7da83aadf4 am:
5717bb1acb -s ours am:
199484a558 am:
fff4a6aff9 am:
c8fbf1a97c am:
8e24a55a3c -s ours am:
76f5a383ea
am:
6e300c3a99
Change-Id: Ie412fe90bc50762933ad6724d854956c286c2f58
Eric Laurent [Wed, 18 Jan 2017 18:02:12 +0000 (18:02 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
7da83aadf4 am:
5717bb1acb -s ours am:
199484a558 am:
fff4a6aff9 am:
c8fbf1a97c am:
8e24a55a3c -s ours
am:
76f5a383ea
Change-Id: I9b07b232e0cdccdf7e9b21ebaa3073839eb8e882
Eric Laurent [Wed, 18 Jan 2017 17:54:39 +0000 (17:54 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
7da83aadf4 am:
5717bb1acb -s ours am:
199484a558 am:
fff4a6aff9 am:
c8fbf1a97c
am:
8e24a55a3c -s ours
Change-Id: Ib577ae77e113b8c0a545ae40fa6d00abbc614f1b
Eric Laurent [Wed, 18 Jan 2017 17:46:39 +0000 (17:46 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
7da83aadf4 am:
5717bb1acb -s ours am:
199484a558 am:
fff4a6aff9
am:
c8fbf1a97c
Change-Id: I8f2e7e5154a16aaa9c365d001866d7372b451471
Eric Laurent [Wed, 18 Jan 2017 17:39:38 +0000 (17:39 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
7da83aadf4 am:
5717bb1acb -s ours am:
199484a558
am:
fff4a6aff9
Change-Id: I0cc78503ad574ae50f2e8ccba5b5d396c5ef8514
Eric Laurent [Wed, 18 Jan 2017 17:33:07 +0000 (17:33 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
7da83aadf4 am:
5717bb1acb -s ours
am:
199484a558
Change-Id: Ic0a17b1de1483de2f12a64d6b159d149abe64923
Eric Laurent [Wed, 18 Jan 2017 17:26:19 +0000 (17:26 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
7da83aadf4
am:
5717bb1acb -s ours
Change-Id: I52dedef569daef7a901ac924575b04c06e431ee0
Eric Laurent [Wed, 18 Jan 2017 17:19:50 +0000 (17:19 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety
am:
7da83aadf4
Change-Id: I39621a0f71df766342b5b768fce1eb524ae5adcd
Eric Laurent [Thu, 1 Dec 2016 23:28:29 +0000 (15:28 -0800)]
DO NOT MERGE - improve audio effect framwework thread safety
- Reorganize handle effect creation code to make sure the effect engine
is created with both thread and effect chain mutex held.
- Reorganize handle disconnect code to make sure the effect engine
is released with both thread and effect chain mutex held.
- Protect IEffect interface methods in EffectHande with a Mutex.
- Only pin effect if the session was acquired first.
- Do not use strong pointer to EffectModule in EffectHandles:
only the EffectChain has a single strong reference to the EffectModule.
- Check reply size before writing status in EffectHandle::command()
Bug:
32707507
Bug:
32095713
Change-Id: Ia1098cba2cd32cc2d1c9dfdff4adc2388dfed80e
(cherry picked from commit
84c392104e905bfacc753ec0ddb96ce7813d1889)
Marco Nelissen [Tue, 17 Jan 2017 21:33:05 +0000 (21:33 +0000)]
Don't CHECK when buffer is too large am:
c2f0c73bfc am:
acb7186e6e am:
0a4db601b4 am:
8474c51aaf am:
a5333c0056 am:
7e5936e666 am:
81341d9c16 am:
5a62595e8e am:
a2c05e0318 am:
04a45728f2 -s ours am:
41dab9b56b am:
56cf3b01fc am:
b9dd2f3074
am:
3ebb5e39b5
Change-Id: I285ab743edef72c080c2bb1131b05c79e4f05fbd
Marco Nelissen [Tue, 17 Jan 2017 21:31:06 +0000 (21:31 +0000)]
Don't CHECK when buffer is too large am:
c2f0c73bfc am:
acb7186e6e am:
0a4db601b4 am:
8474c51aaf am:
a5333c0056 am:
7e5936e666 am:
81341d9c16 am:
5a62595e8e am:
a2c05e0318 am:
04a45728f2 -s ours am:
41dab9b56b am:
56cf3b01fc
am:
b9dd2f3074
Change-Id: I0efe467a0b23dd2ea2a3da2b27c09d5094389cd4
Marco Nelissen [Tue, 17 Jan 2017 21:28:53 +0000 (21:28 +0000)]
Don't CHECK when buffer is too large am:
c2f0c73bfc am:
acb7186e6e am:
0a4db601b4 am:
8474c51aaf am:
a5333c0056 am:
7e5936e666 am:
81341d9c16 am:
5a62595e8e am:
a2c05e0318 am:
04a45728f2 -s ours am:
41dab9b56b
am:
56cf3b01fc
Change-Id: I579ce59c95ff48a15700a58658910ef84f8ff944
Marco Nelissen [Tue, 17 Jan 2017 21:26:35 +0000 (21:26 +0000)]
Don't CHECK when buffer is too large am:
c2f0c73bfc am:
acb7186e6e am:
0a4db601b4 am:
8474c51aaf am:
a5333c0056 am:
7e5936e666 am:
81341d9c16 am:
5a62595e8e am:
a2c05e0318 am:
04a45728f2 -s ours
am:
41dab9b56b
Change-Id: Iae75361f638d14d77a228d826ade141108ec52fd
Marco Nelissen [Tue, 17 Jan 2017 21:24:08 +0000 (21:24 +0000)]
Don't CHECK when buffer is too large am:
c2f0c73bfc am:
acb7186e6e am:
0a4db601b4 am:
8474c51aaf am:
a5333c0056 am:
7e5936e666 am:
81341d9c16 am:
5a62595e8e am:
a2c05e0318
am:
04a45728f2 -s ours
Change-Id: I10352f5bd8621059ffc97156115adbac27625fbc
Marco Nelissen [Tue, 17 Jan 2017 19:23:22 +0000 (19:23 +0000)]
Don't CHECK when buffer is too large am:
c2f0c73bfc am:
acb7186e6e am:
0a4db601b4 am:
8474c51aaf am:
a5333c0056 am:
7e5936e666 am:
81341d9c16 am:
5a62595e8e
am:
a2c05e0318
Change-Id: I065a2fcd2ba52123c0ce0acfda947b864923a626
Marco Nelissen [Tue, 17 Jan 2017 19:18:56 +0000 (19:18 +0000)]
Don't CHECK when buffer is too large am:
c2f0c73bfc am:
acb7186e6e am:
0a4db601b4 am:
8474c51aaf am:
a5333c0056 am:
7e5936e666 am:
81341d9c16
am:
5a62595e8e
Change-Id: Ib934e29990941bb7e30196be3ff7b1d67e61b211
Marco Nelissen [Tue, 17 Jan 2017 19:16:55 +0000 (19:16 +0000)]
Don't CHECK when buffer is too large am:
c2f0c73bfc am:
acb7186e6e am:
0a4db601b4 am:
8474c51aaf am:
a5333c0056 am:
7e5936e666
am:
81341d9c16
Change-Id: I701b122b4f3f97b7b8b76af25cd6fe9c67ef792b
Marco Nelissen [Tue, 17 Jan 2017 19:14:26 +0000 (19:14 +0000)]
Don't CHECK when buffer is too large am:
c2f0c73bfc am:
acb7186e6e am:
0a4db601b4 am:
8474c51aaf am:
a5333c0056
am:
7e5936e666
Change-Id: I8f4d5bb31a2600f6679d21fed9ebc02c2a3e3521
Marco Nelissen [Tue, 17 Jan 2017 19:12:27 +0000 (19:12 +0000)]
Don't CHECK when buffer is too large am:
c2f0c73bfc am:
acb7186e6e am:
0a4db601b4 am:
8474c51aaf
am:
a5333c0056
Change-Id: I572634a3e7e9161d0f6811adf83d37178e3895c3
Marco Nelissen [Tue, 17 Jan 2017 19:10:23 +0000 (19:10 +0000)]
Don't CHECK when buffer is too large am:
c2f0c73bfc am:
acb7186e6e am:
0a4db601b4
am:
8474c51aaf
Change-Id: I8a151eff3d02600134c929754c1420353f6a6ab1
Marco Nelissen [Tue, 17 Jan 2017 19:06:56 +0000 (19:06 +0000)]
Don't CHECK when buffer is too large am:
c2f0c73bfc am:
acb7186e6e
am:
0a4db601b4
Change-Id: I46806d03da614119b805087d995f8f40c70ee3b2
Marco Nelissen [Tue, 17 Jan 2017 18:46:50 +0000 (18:46 +0000)]
Don't CHECK when buffer is too large am:
c2f0c73bfc
am:
acb7186e6e
Change-Id: I9af93746702bb746a48420dbb03fc29878ef730f
Marco Nelissen [Tue, 17 Jan 2017 18:27:32 +0000 (18:27 +0000)]
Don't CHECK when buffer is too large
am:
c2f0c73bfc
Change-Id: Ibcc5b7a28092fdcba5082b956e3bbdb0fc2d3f4a
Marco Nelissen [Sat, 14 Jan 2017 05:52:19 +0000 (21:52 -0800)]
resolve merge conflicts of
1038297e29 to nyc-mr2-dev
Change-Id: I75f6cf03181817861b7732ebc0253e56801ed6b8
Marco Nelissen [Sat, 14 Jan 2017 02:53:23 +0000 (02:53 +0000)]
Don't initialize sync sample parameters until the end am:
a9660fe122 am:
22386993b5 am:
902d8e90cc am:
25a057e427 am:
c3ea68a1c8 am:
a59dca6634 am:
5cc0712ce0 am:
835c7ec015 am:
c0b4ce0047
am:
c3773d1a94
Change-Id: Ic9819575db5b610e3c81f32ca49b82c86691575f
Marco Nelissen [Sat, 14 Jan 2017 02:51:23 +0000 (02:51 +0000)]
Don't initialize sync sample parameters until the end am:
a9660fe122 am:
22386993b5 am:
902d8e90cc am:
25a057e427 am:
c3ea68a1c8 am:
a59dca6634 am:
5cc0712ce0 am:
835c7ec015
am:
c0b4ce0047
Change-Id: Ia9e6e1e8d173687de18bbbf81ff669c44b9548e5
Marco Nelissen [Sat, 14 Jan 2017 02:48:55 +0000 (02:48 +0000)]
Don't initialize sync sample parameters until the end am:
a9660fe122 am:
22386993b5 am:
902d8e90cc am:
25a057e427 am:
c3ea68a1c8 am:
a59dca6634 am:
5cc0712ce0
am:
835c7ec015
Change-Id: I334a6748dfa61ee40d9b57eb2da8f178888d708e
Marco Nelissen [Sat, 14 Jan 2017 02:46:26 +0000 (02:46 +0000)]
Don't initialize sync sample parameters until the end am:
a9660fe122 am:
22386993b5 am:
902d8e90cc am:
25a057e427 am:
c3ea68a1c8 am:
a59dca6634
am:
5cc0712ce0
Change-Id: If8703ef19663c7f25493101a871976e54ab2a3e8
Marco Nelissen [Sat, 14 Jan 2017 02:44:24 +0000 (02:44 +0000)]
Don't initialize sync sample parameters until the end am:
a9660fe122 am:
22386993b5 am:
902d8e90cc am:
25a057e427 am:
c3ea68a1c8
am:
a59dca6634
Change-Id: I80ed5f790d1ceb2aa9f779397f75a36a5a4db8b6
Marco Nelissen [Sat, 14 Jan 2017 02:41:23 +0000 (02:41 +0000)]
Don't initialize sync sample parameters until the end am:
a9660fe122 am:
22386993b5 am:
902d8e90cc am:
25a057e427
am:
c3ea68a1c8
Change-Id: Ica12b7c73830bfbdb8a6aad323835f264a4110e3
Marco Nelissen [Sat, 14 Jan 2017 02:39:22 +0000 (02:39 +0000)]
Don't initialize sync sample parameters until the end am:
a9660fe122 am:
22386993b5 am:
902d8e90cc
am:
25a057e427
Change-Id: Ica77a9017bd8446b03057563172e9f807708634c
Marco Nelissen [Sat, 14 Jan 2017 02:36:54 +0000 (02:36 +0000)]
Don't initialize sync sample parameters until the end am:
a9660fe122 am:
22386993b5
am:
902d8e90cc
Change-Id: I6ba553f3ac3f04ef983e498756a19718b04f5206
Marco Nelissen [Sat, 14 Jan 2017 02:34:21 +0000 (02:34 +0000)]
Don't initialize sync sample parameters until the end am:
a9660fe122
am:
22386993b5
Change-Id: Ia743be4048c57929c59b06a12b53f993b5b00111
Marco Nelissen [Sat, 14 Jan 2017 02:31:51 +0000 (02:31 +0000)]
Don't initialize sync sample parameters until the end
am:
a9660fe122
Change-Id: Ia072f16604c3e766d4d2cdc49b88efcf182ca5f7
Eric Laurent [Sat, 14 Jan 2017 00:51:58 +0000 (00:51 +0000)]
Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into nyc-dev am:
5ab2dba9d6 -s ours am:
1d2f93208d -s ours am:
6483838270 -s ours
am:
46c00e467d -s ours
Change-Id: If00859de467e5150dda4d4b1eb7846c359714259
Eric Laurent [Sat, 14 Jan 2017 00:51:44 +0000 (00:51 +0000)]
DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety am:
b37f28adae -s ours am:
b5d31fca16 -s ours am:
e6bb1bdd21 -s ours
am:
d7848ce659 -s ours
Change-Id: I3e76aa710487e2e177a6b06c623542b090614b6d
Eric Laurent [Sat, 14 Jan 2017 00:49:59 +0000 (00:49 +0000)]
Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into nyc-dev am:
5ab2dba9d6 -s ours am:
1d2f93208d -s ours
am:
6483838270 -s ours
Change-Id: I9a08e15b9cbeedd780f71ee9e289dfe19aff03dc
Eric Laurent [Sat, 14 Jan 2017 00:49:45 +0000 (00:49 +0000)]
DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety am:
b37f28adae -s ours am:
b5d31fca16 -s ours
am:
e6bb1bdd21 -s ours
Change-Id: Ic5b692cdf76586585ab7e1718fec549635746840
Eric Laurent [Sat, 14 Jan 2017 00:47:28 +0000 (00:47 +0000)]
Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into nyc-dev am:
5ab2dba9d6 -s ours
am:
1d2f93208d -s ours
Change-Id: Ic97851e34bfb989aae8773f0475ae6a61d967950
Eric Laurent [Sat, 14 Jan 2017 00:47:15 +0000 (00:47 +0000)]
DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety am:
b37f28adae -s ours
am:
b5d31fca16 -s ours
Change-Id: I2bca0d14033adf930ca164c1ce80a425b180c665
Eric Laurent [Sat, 14 Jan 2017 00:45:14 +0000 (00:45 +0000)]
Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into nyc-dev
am:
5ab2dba9d6 -s ours
Change-Id: I84752978cc0e040cdd11a2112163a5977b26bddb
Eric Laurent [Sat, 14 Jan 2017 00:45:13 +0000 (00:45 +0000)]
DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety
am:
b37f28adae -s ours
Change-Id: I8c949ea028d93e0de24528731d2aaaeededcd779
Eric Laurent [Sat, 14 Jan 2017 00:41:48 +0000 (00:41 +0000)]
Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into nyc-dev
Marco Nelissen [Thu, 12 Jan 2017 23:49:04 +0000 (15:49 -0800)]
Don't initialize sync sample parameters until the end
to avoid leaving them in a partially initialized state.
Bug:
33137046
Test: ran CTS tests
Change-Id: I1f5c070233c5917d85da9e930e01a3fc51a0a0ec
Marco Nelissen [Fri, 6 Jan 2017 21:57:51 +0000 (13:57 -0800)]
Don't CHECK when buffer is too large
Bug:
31647370
Test: ran CTS test with and without patch
Change-Id: I4e3a37aabc9387432671c1c0c469241142612cc4
Daichi Hirono [Tue, 4 Oct 2016 08:34:43 +0000 (17:34 +0900)]
Don't send short URB packet when sending MtpDataPacket.
When sending a MtpDataPacket to a MTP device, the kernel driver splits
it into multiple URB packets so that the URB packet size does not exceed
the buffer size at the MTP device.
Previously MtpDataPacket sends its header first, then sends the
payload. It means the first URB packet only contains the header of
MtpDataPacket and the URB packet size is smaller than the maximum URB
packet size (short packet). Some MTP devices regard the short packet as
the end of the sequencail URB packets, thus the devices do not accept
the following URB packets that contain the payload.
The MTP spec says if the responder (MTP device) sends the data in a way
where the first pacekt contains only the header, the initiator (MTP
host) must send data in the same way. Otherwise the initiator must not
send a short packet in the sequencial URB packets.
The CL fixes the MTP host implementation so that it remembers how the
MTP device sends data, and uses the same way when sending data
from the host.
Bug:
31165557
Test: Manually invokes MtpDevice#sendObject
Change-Id: Ic76eb4241ed74957414aef2990be08cd77a9f5a9
(cherry picked from commit
d4b4296b401162a7a42f757c96e3652b82255b13)
Daichi Hirono [Tue, 4 Oct 2016 08:45:31 +0000 (17:45 +0900)]
Stop sending object handle with sendObject request.
According to the MTP spec, the sendObject request must follow
sendObjectInfo request and we could not send an object handle with
sendObject request. The CL stops sending object handle with a sendObject
request. Instead it checks if the given object handle equals to the
object handle returned by the previous sendObjectInfo request.
Bug:
31918048
Test: manually invoked sendObjectInfo and sendObject.
Change-Id: I0a80bdf67bf2913522821ac705f3dc548d3edead
(cherry picked from commit
8d20945c08dfdd85c252c8ba92d197bf1bd2b208)
Jeff Tinker [Mon, 9 Jan 2017 16:03:59 +0000 (16:03 +0000)]
Merge "DO NOT MERGE Move legacy widevine classic global lock from framework to vendor/widevine implementation." into nyc-mr2-dev
OSDN Git Service
