OSDN Git Service
Mikhail Naganov [Tue, 18 Jul 2017 17:02:56 +0000 (17:02 +0000)]
Merge "Fix a crash happening in NBLog's 'writeHistToFile'" into oc-dr1-dev
am:
4f771e05db
Change-Id: I5f98efcc60004463862425b9bc4305ad2bd2369d
TreeHugger Robot [Tue, 18 Jul 2017 16:56:40 +0000 (16:56 +0000)]
Merge "Fix a crash happening in NBLog's 'writeHistToFile'" into oc-dr1-dev
Phil Burk [Tue, 18 Jul 2017 13:53:16 +0000 (13:53 +0000)]
Merge "audio: reduce logspam from MMAP mode" into oc-dr1-dev
am:
4dbbda2d8c
Change-Id: I05dc5fc8eed6e3623f01b87df205d009f04cc3f8
Phil Burk [Tue, 18 Jul 2017 13:47:40 +0000 (13:47 +0000)]
Merge "audio: reduce logspam from MMAP mode" into oc-dr1-dev
Eric Laurent [Tue, 18 Jul 2017 00:39:26 +0000 (00:39 +0000)]
audio flinger: fix AEC and NS suspend logic
am:
d8365c54d0
Change-Id: Ibe210d88cbd423dfb6c9840946e3d4e35c27dfd1
Mikhail Naganov [Mon, 17 Jul 2017 23:53:38 +0000 (16:53 -0700)]
Fix a crash happening in NBLog's 'writeHistToFile'
The issue was in the possibility of the 'intervals' vector being
empty if the provided 'samples' vector contains only one
element. That leads to 'intervals.end()' being passed to
'intervals.erase()', and vector::erase produces undefined
behaviour in that case.
I see no other calls to 'erase' or 'max_element' in libnbaio,
so that should be the only fix needed.
Bug:
62536501
Test: see test case at bug
Change-Id: I37f93fa42030ed6f5bcb2d46b0a7a2c0af3c82e4
Eric Laurent [Sun, 16 Jul 2017 22:27:05 +0000 (15:27 -0700)]
audio flinger: fix AEC and NS suspend logic
Make sure we suspend/restore AEC and NS only when the suspend condition
actually changes to avoid mismatch in number of suspends/restores
causing the ref counting mechanism to leave the effects in suspend mode
while they should not.
Also clear the suspend state on an effect session before parking it in
the orphan chains list so that it is in default state whne attached to a
new record thread.
Bug:
63015903
Test: verify that switching BT SCO on/off with Duo enables or disables
AEC and NS accordingly
Change-Id: I4d0f0bf818deca3952da3c67bb7e83cb500429c7
jiabin [Mon, 17 Jul 2017 19:09:34 +0000 (19:09 +0000)]
Merge "Add parameters validation on AAudio MMap server" into oc-dr1-dev
am:
30bf42ca72
Change-Id: I6e200b18f9d1c7a02b702a41715ef061b5cafdd8
TreeHugger Robot [Mon, 17 Jul 2017 19:04:45 +0000 (19:04 +0000)]
Merge "Add parameters validation on AAudio MMap server" into oc-dr1-dev
Phil Burk [Mon, 17 Jul 2017 18:13:37 +0000 (11:13 -0700)]
audio: reduce logspam from MMAP mode
Bug:
63760826
Test: run CTS nativemedia/aaudio and notice less logging
Change-Id: I04564963f85577a53f40f1bad064f5e79723ac76
Yin-Chia Yeh [Mon, 17 Jul 2017 18:06:59 +0000 (18:06 +0000)]
Merge "Camera: fix bufferFreed callback object lifecycle issue" into oc-dr1-dev
am:
32ab0585ff
Change-Id: Ief8f546531f68d6521f69ad0e8d7307b390703c6
TreeHugger Robot [Mon, 17 Jul 2017 18:01:56 +0000 (18:01 +0000)]
Merge "Camera: fix bufferFreed callback object lifecycle issue" into oc-dr1-dev
Shuzhen Wang [Sat, 15 Jul 2017 18:19:40 +0000 (18:19 +0000)]
Merge "Camera: Fix "use after free" for mOutstandingBuffers" into oc-dr1-dev
am:
af842eb79e
Change-Id: Ia107339f617ccd73510ab8ceeeb61559fb1de958
TreeHugger Robot [Sat, 15 Jul 2017 18:14:19 +0000 (18:14 +0000)]
Merge "Camera: Fix "use after free" for mOutstandingBuffers" into oc-dr1-dev
Android Build Merger (Role) [Sat, 15 Jul 2017 01:04:25 +0000 (01:04 +0000)]
Merge "Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev am:
125fc63d73 am:
a5d728cce1 am:
ccd8680538 am:
dd36008b78 am:
80e7e68dbf" into oc-dr1-dev-plus-aosp
Eric Laurent [Sat, 15 Jul 2017 01:04:08 +0000 (01:04 +0000)]
Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev am:
125fc63d73 am:
a5d728cce1 am:
ccd8680538 am:
dd36008b78
am:
e68bb33712
Change-Id: Ia8dd203330a310795c71282386ed527f9eb7267f
Eric Laurent [Sat, 15 Jul 2017 01:04:08 +0000 (01:04 +0000)]
Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev am:
125fc63d73 am:
a5d728cce1 am:
ccd8680538 am:
dd36008b78
am:
80e7e68dbf
Change-Id: Ibe2bc6fac7a100cfaba5097a3b5ab7ac9a1aa2fa
Eric Laurent [Sat, 15 Jul 2017 01:00:07 +0000 (01:00 +0000)]
Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev am:
125fc63d73 am:
a5d728cce1 am:
ccd8680538
am:
dd36008b78
Change-Id: Icd196218ebeaa40b2463b1a35eb2cb9e27d76b0c
Eric Laurent [Sat, 15 Jul 2017 01:00:06 +0000 (01:00 +0000)]
Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev am:
125fc63d73 am:
a5d728cce1 am:
ccd8680538
am:
dd36008b78
Change-Id: I4ffd95bcaa4dd9a6637c93e85d4c3c18c0a7f89f
Eric Laurent [Sat, 15 Jul 2017 00:56:06 +0000 (00:56 +0000)]
Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev am:
125fc63d73 am:
a5d728cce1
am:
ccd8680538
Change-Id: I0af69333bcb67ef6534175ce986fc05e5a26ffa6
Eric Laurent [Sat, 15 Jul 2017 00:52:06 +0000 (00:52 +0000)]
Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev am:
125fc63d73
am:
a5d728cce1
Change-Id: I82e1af7e7ff4b7dcc7a9b1121893f7514fdbf05d
Eric Laurent [Sat, 15 Jul 2017 00:48:07 +0000 (00:48 +0000)]
Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev
am:
125fc63d73
Change-Id: I33f038d357f2f698df9b37f09ac03e72c32b9bd8
Android Build Merger (Role) [Sat, 15 Jul 2017 00:44:25 +0000 (00:44 +0000)]
Merge "Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f am:
b8dfff52ee am:
5445ddc983 -s ours am:
8700c26a91 -s ours am:
b063a7ea18 am:
92fce7ece7 -s ours am:
3627617c2b am:
671c88a807 am:
1feb9dca54 am:
29b801537c -s ours am:
e68844ffb0 am:
bd6594eaf2 am:
301e363ed5 am:
8ea826e20d am:
4fa1ff8958 -s ours am:
024216f32b am:
aee0c0b508" into oc-dr1-dev-plus-aosp
Wei Jia [Sat, 15 Jul 2017 00:44:10 +0000 (00:44 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f am:
b8dfff52ee am:
5445ddc983 -s ours am:
8700c26a91 -s ours am:
b063a7ea18 am:
92fce7ece7 -s ours am:
3627617c2b am:
671c88a807 am:
1feb9dca54 am:
29b801537c -s ours am:
e68844ffb0 am:
bd6594eaf2 am:
301e363ed5 am:
8ea826e20d am:
4fa1ff8958 -s ours am:
024216f32b
am:
42ab59fcd8
Change-Id: I546f2408089202ae63e1bb26abcde323bb5310d0
Wei Jia [Sat, 15 Jul 2017 00:44:09 +0000 (00:44 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f am:
b8dfff52ee am:
5445ddc983 -s ours am:
8700c26a91 -s ours am:
b063a7ea18 am:
92fce7ece7 -s ours am:
3627617c2b am:
671c88a807 am:
1feb9dca54 am:
29b801537c -s ours am:
e68844ffb0 am:
bd6594eaf2 am:
301e363ed5 am:
8ea826e20d am:
4fa1ff8958 -s ours am:
024216f32b
am:
aee0c0b508
Change-Id: I65f56a341033cb350357a7029bcffe3900e9794d
Wei Jia [Sat, 15 Jul 2017 00:40:10 +0000 (00:40 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f am:
b8dfff52ee am:
5445ddc983 -s ours am:
8700c26a91 -s ours am:
b063a7ea18 am:
92fce7ece7 -s ours am:
3627617c2b am:
671c88a807 am:
1feb9dca54 am:
29b801537c -s ours am:
e68844ffb0 am:
bd6594eaf2 am:
301e363ed5 am:
8ea826e20d am:
4fa1ff8958 -s ours
am:
024216f32b
Change-Id: Ic4e20defc6f54e16cd9d8ce284db8a9354b4e53a
Wei Jia [Sat, 15 Jul 2017 00:40:10 +0000 (00:40 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f am:
b8dfff52ee am:
5445ddc983 -s ours am:
8700c26a91 -s ours am:
b063a7ea18 am:
92fce7ece7 -s ours am:
3627617c2b am:
671c88a807 am:
1feb9dca54 am:
29b801537c -s ours am:
e68844ffb0 am:
bd6594eaf2 am:
301e363ed5 am:
8ea826e20d am:
4fa1ff8958 -s ours
am:
024216f32b
Change-Id: I9d8f260ec6c5837930b20076377b2c11774b6cc4
TreeHugger Robot [Sat, 15 Jul 2017 00:39:40 +0000 (00:39 +0000)]
Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev
Wei Jia [Sat, 15 Jul 2017 00:35:36 +0000 (00:35 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f am:
b8dfff52ee am:
5445ddc983 -s ours am:
8700c26a91 -s ours am:
b063a7ea18 am:
92fce7ece7 -s ours am:
3627617c2b am:
671c88a807 am:
1feb9dca54 am:
29b801537c -s ours am:
e68844ffb0 am:
bd6594eaf2 am:
301e363ed5 am:
8ea826e20d
am:
4fa1ff8958 -s ours
Change-Id: I9a005a4cd15a78c8cc8147e0820c8861c4a14b54
Hangyu Kuang [Sat, 15 Jul 2017 00:32:22 +0000 (00:32 +0000)]
Merge "media: Add more debug information to help timestamp debugging." into oc-dr1-dev
am:
1a0af2f643
Change-Id: Ic4ff1df004dfedf338df94df41413c27cbbfa0db
Android Build Merger (Role) [Sat, 15 Jul 2017 00:31:57 +0000 (00:31 +0000)]
Merge "Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours am:
162672a9f6 am:
9215fa05fe am:
6757de98ca am:
a32f7beef6 -s ours am:
04e0e9c697 am:
eb81b99c4a am:
bb3f0c8d1c am:
9c8bf537e2 am:
76301f781d -s ours am:
d3e64e7e1e am:
bfff1b4942" into oc-dr1-dev-plus-aosp
Wei Jia [Sat, 15 Jul 2017 00:31:44 +0000 (00:31 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours am:
162672a9f6 am:
9215fa05fe am:
6757de98ca am:
a32f7beef6 -s ours am:
04e0e9c697 am:
eb81b99c4a am:
bb3f0c8d1c am:
9c8bf537e2 am:
76301f781d -s ours am:
d3e64e7e1e
am:
bfff1b4942
Change-Id: I63a7ee8f933749776d3c8fe4036942a3988d1b7e
Wei Jia [Sat, 15 Jul 2017 00:31:38 +0000 (00:31 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f am:
b8dfff52ee am:
5445ddc983 -s ours am:
8700c26a91 -s ours am:
b063a7ea18 am:
92fce7ece7 -s ours am:
3627617c2b am:
671c88a807 am:
1feb9dca54 am:
29b801537c -s ours am:
e68844ffb0 am:
bd6594eaf2 am:
301e363ed5
am:
8ea826e20d
Change-Id: I103d3f965c85f35e99efb9f1ebd30f9d53efaea5
Wei Jia [Sat, 15 Jul 2017 00:31:38 +0000 (00:31 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours am:
162672a9f6 am:
9215fa05fe am:
6757de98ca am:
a32f7beef6 -s ours am:
04e0e9c697 am:
eb81b99c4a am:
bb3f0c8d1c am:
9c8bf537e2 am:
76301f781d -s ours am:
d3e64e7e1e
am:
4549b5c4e8
Change-Id: Ia2acef9f062f0bd8a66e64eef73c125611b22531
TreeHugger Robot [Sat, 15 Jul 2017 00:29:53 +0000 (00:29 +0000)]
Merge "media: Add more debug information to help timestamp debugging." into oc-dr1-dev
Wei Jia [Sat, 15 Jul 2017 00:27:11 +0000 (00:27 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours am:
162672a9f6 am:
9215fa05fe am:
6757de98ca am:
a32f7beef6 -s ours am:
04e0e9c697 am:
eb81b99c4a am:
bb3f0c8d1c am:
9c8bf537e2 am:
76301f781d -s ours
am:
d3e64e7e1e
Change-Id: I9b9799bfa65cace6f6bab85b293f8ff158f94eab
Wei Jia [Sat, 15 Jul 2017 00:27:07 +0000 (00:27 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f am:
b8dfff52ee am:
5445ddc983 -s ours am:
8700c26a91 -s ours am:
b063a7ea18 am:
92fce7ece7 -s ours am:
3627617c2b am:
671c88a807 am:
1feb9dca54 am:
29b801537c -s ours am:
e68844ffb0 am:
bd6594eaf2
am:
301e363ed5
Change-Id: Ie302f86f5110b63b0c1d866c35c7c88f4577cac9
Wei Jia [Sat, 15 Jul 2017 00:27:07 +0000 (00:27 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours am:
162672a9f6 am:
9215fa05fe am:
6757de98ca am:
a32f7beef6 -s ours am:
04e0e9c697 am:
eb81b99c4a am:
bb3f0c8d1c am:
9c8bf537e2 am:
76301f781d -s ours
am:
d3e64e7e1e
Change-Id: I7f92da08275fc9e4e71485dabcd44a9a5a1b85c7
Wei Jia [Sat, 15 Jul 2017 00:23:05 +0000 (00:23 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f am:
b8dfff52ee am:
5445ddc983 -s ours am:
8700c26a91 -s ours am:
b063a7ea18 am:
92fce7ece7 -s ours am:
3627617c2b am:
671c88a807 am:
1feb9dca54 am:
29b801537c -s ours am:
e68844ffb0
am:
bd6594eaf2
Change-Id: I864241ad497a7a59f870103f23e1306fa1dc519d
Wei Jia [Sat, 15 Jul 2017 00:23:04 +0000 (00:23 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours am:
162672a9f6 am:
9215fa05fe am:
6757de98ca am:
a32f7beef6 -s ours am:
04e0e9c697 am:
eb81b99c4a am:
bb3f0c8d1c am:
9c8bf537e2
am:
76301f781d -s ours
Change-Id: I8739fcae53e81f21ab6843a467dd442856666ce2
Android Build Merger (Role) [Sat, 15 Jul 2017 00:19:02 +0000 (00:19 +0000)]
Merge "Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am:
80059d44c4 am:
72840f2216 am:
9e9987c46d am:
9583ca702a -s ours am:
acf3c39437 am:
d1ce7bb7c8 am:
bd951d1c5c am:
570dd1184d am:
7475e7996a -s ours am:
5652b2b4d9 am:
5a27b151ae" into oc-dr1-dev-plus-aosp
Wei Jia [Sat, 15 Jul 2017 00:18:38 +0000 (00:18 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours am:
162672a9f6 am:
9215fa05fe am:
6757de98ca am:
a32f7beef6 -s ours am:
04e0e9c697 am:
eb81b99c4a am:
bb3f0c8d1c
am:
9c8bf537e2
Change-Id: I82d00420fc16adcc7104344c7ffb10d2d9b661f7
Wei Jia [Sat, 15 Jul 2017 00:18:37 +0000 (00:18 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f am:
b8dfff52ee am:
5445ddc983 -s ours am:
8700c26a91 -s ours am:
b063a7ea18 am:
92fce7ece7 -s ours am:
3627617c2b am:
671c88a807 am:
1feb9dca54 am:
29b801537c -s ours
am:
e68844ffb0
Change-Id: I6546b41a2da12c64db52ed9081ebf20c53eec469
Wei Jia [Sat, 15 Jul 2017 00:18:37 +0000 (00:18 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am:
80059d44c4 am:
72840f2216 am:
9e9987c46d am:
9583ca702a -s ours am:
acf3c39437 am:
d1ce7bb7c8 am:
bd951d1c5c am:
570dd1184d am:
7475e7996a -s ours am:
5652b2b4d9
am:
b991781730
Change-Id: Id46de2f743aec60db33cf1866643f3c3a5bfb9e3
Wei Jia [Sat, 15 Jul 2017 00:18:36 +0000 (00:18 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am:
80059d44c4 am:
72840f2216 am:
9e9987c46d am:
9583ca702a -s ours am:
acf3c39437 am:
d1ce7bb7c8 am:
bd951d1c5c am:
570dd1184d am:
7475e7996a -s ours am:
5652b2b4d9
am:
5a27b151ae
Change-Id: I8f9532f0094e60007ed32679879fa024893b65a7
Wei Jia [Sat, 15 Jul 2017 00:14:36 +0000 (00:14 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am:
80059d44c4 am:
72840f2216 am:
9e9987c46d am:
9583ca702a -s ours am:
acf3c39437 am:
d1ce7bb7c8 am:
bd951d1c5c am:
570dd1184d am:
7475e7996a -s ours
am:
5652b2b4d9
Change-Id: Idaf975096b3628ebdc10c0e20290daa02f07c982
Wei Jia [Sat, 15 Jul 2017 00:14:36 +0000 (00:14 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours am:
162672a9f6 am:
9215fa05fe am:
6757de98ca am:
a32f7beef6 -s ours am:
04e0e9c697 am:
eb81b99c4a
am:
bb3f0c8d1c
Change-Id: I739d1eb58978819df7e0fd8489201c30cb29ca28
Wei Jia [Sat, 15 Jul 2017 00:14:36 +0000 (00:14 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am:
80059d44c4 am:
72840f2216 am:
9e9987c46d am:
9583ca702a -s ours am:
acf3c39437 am:
d1ce7bb7c8 am:
bd951d1c5c am:
570dd1184d am:
7475e7996a -s ours
am:
5652b2b4d9
Change-Id: I313764e4cb8dd0fbede7ae9ce7a6aacc2c262a82
Wei Jia [Sat, 15 Jul 2017 00:14:35 +0000 (00:14 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f am:
b8dfff52ee am:
5445ddc983 -s ours am:
8700c26a91 -s ours am:
b063a7ea18 am:
92fce7ece7 -s ours am:
3627617c2b am:
671c88a807 am:
1feb9dca54
am:
29b801537c -s ours
Change-Id: I0b3318fac39fae495963b005d22a3d954798b5f9
Wei Jia [Sat, 15 Jul 2017 00:10:36 +0000 (00:10 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours am:
162672a9f6 am:
9215fa05fe am:
6757de98ca am:
a32f7beef6 -s ours am:
04e0e9c697
am:
eb81b99c4a
Change-Id: I708670b95e61a05ef2592fd0fef2615e54aebb1d
Wei Jia [Sat, 15 Jul 2017 00:10:36 +0000 (00:10 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f am:
b8dfff52ee am:
5445ddc983 -s ours am:
8700c26a91 -s ours am:
b063a7ea18 am:
92fce7ece7 -s ours am:
3627617c2b am:
671c88a807
am:
1feb9dca54
Change-Id: I1ee61709a12f2045eb946dad3946fa8aafee2caf
Wei Jia [Sat, 15 Jul 2017 00:10:32 +0000 (00:10 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am:
80059d44c4 am:
72840f2216 am:
9e9987c46d am:
9583ca702a -s ours am:
acf3c39437 am:
d1ce7bb7c8 am:
bd951d1c5c am:
570dd1184d
am:
7475e7996a -s ours
Change-Id: I4d0b520a58b87d750d65450e270a314ff9aa7897
Wei Jia [Sat, 15 Jul 2017 00:06:35 +0000 (00:06 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours am:
162672a9f6 am:
9215fa05fe am:
6757de98ca am:
a32f7beef6 -s ours
am:
04e0e9c697
Change-Id: Ib0e54fbe12d38aa3c2517e7dff4863e2fa2cb4cb
Wei Jia [Sat, 15 Jul 2017 00:06:35 +0000 (00:06 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f am:
b8dfff52ee am:
5445ddc983 -s ours am:
8700c26a91 -s ours am:
b063a7ea18 am:
92fce7ece7 -s ours am:
3627617c2b
am:
671c88a807
Change-Id: Idf5e9e2fd694682031a3b98e53469a3d617c375d
Wei Jia [Sat, 15 Jul 2017 00:06:34 +0000 (00:06 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am:
80059d44c4 am:
72840f2216 am:
9e9987c46d am:
9583ca702a -s ours am:
acf3c39437 am:
d1ce7bb7c8 am:
bd951d1c5c
am:
570dd1184d
Change-Id: I213374dc538eb926060df27b10721c9606bcd56c
Android Build Merger (Role) [Sat, 15 Jul 2017 00:02:32 +0000 (00:02 +0000)]
Merge "Merge "MPEG4Extractor: ensure returned status is checked." into nyc-dev am:
02772b134e am:
2aa463e371 am:
4fa11b6cdf am:
ae73886c4d am:
447c686405 am:
4865242a90 am:
c6d804df5e" into oc-dr1-dev-plus-aosp
Wei Jia [Sat, 15 Jul 2017 00:02:04 +0000 (00:02 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f am:
b8dfff52ee am:
5445ddc983 -s ours am:
8700c26a91 -s ours am:
b063a7ea18 am:
92fce7ece7 -s ours
am:
3627617c2b
Change-Id: I6f4f806ac57f4bf75bc0963f477372d4afa8bfc3
Wei Jia [Sat, 15 Jul 2017 00:02:04 +0000 (00:02 +0000)]
Merge "MPEG4Extractor: ensure returned status is checked." into nyc-dev am:
02772b134e am:
2aa463e371 am:
4fa11b6cdf am:
ae73886c4d am:
447c686405 am:
4865242a90
am:
c6d804df5e
Change-Id: I80c6fea86786718d8729ff45f28182dd4f3b6800
Wei Jia [Sat, 15 Jul 2017 00:02:03 +0000 (00:02 +0000)]
Merge "MPEG4Extractor: ensure returned status is checked." into nyc-dev am:
02772b134e am:
2aa463e371 am:
4fa11b6cdf am:
ae73886c4d am:
447c686405 am:
4865242a90
am:
63dcf31ee3
Change-Id: I8ec949b965d2dc992783cd2162ba8cd8f30d951e
Wei Jia [Sat, 15 Jul 2017 00:02:02 +0000 (00:02 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am:
80059d44c4 am:
72840f2216 am:
9e9987c46d am:
9583ca702a -s ours am:
acf3c39437 am:
d1ce7bb7c8
am:
bd951d1c5c
Change-Id: I0ff608f66320230f34dc793b9dda746fce627d51
Wei Jia [Sat, 15 Jul 2017 00:02:02 +0000 (00:02 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours am:
162672a9f6 am:
9215fa05fe am:
6757de98ca
am:
a32f7beef6 -s ours
Change-Id: If81402f72f73362e4f642b77a433be09675d2b55
Wei Jia [Fri, 14 Jul 2017 23:58:34 +0000 (23:58 +0000)]
Merge "MPEG4Extractor: ensure returned status is checked." into nyc-dev am:
02772b134e am:
2aa463e371 am:
4fa11b6cdf am:
ae73886c4d am:
447c686405
am:
4865242a90
Change-Id: I3585c7570927adcdc4868482b573ac25323848d3
Wei Jia [Fri, 14 Jul 2017 23:58:33 +0000 (23:58 +0000)]
Merge "MPEG4Extractor: ensure returned status is checked." into nyc-dev am:
02772b134e am:
2aa463e371 am:
4fa11b6cdf am:
ae73886c4d am:
447c686405
am:
4865242a90
Change-Id: I75517eb7518d42c8ddd9e2421d2029e737b86e46
Wei Jia [Fri, 14 Jul 2017 23:58:32 +0000 (23:58 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am:
80059d44c4 am:
72840f2216 am:
9e9987c46d am:
9583ca702a -s ours am:
acf3c39437
am:
d1ce7bb7c8
Change-Id: Ib2d891e80b63e42c76ae037f3d41bc5eb4ab3cb5
Wei Jia [Fri, 14 Jul 2017 23:58:32 +0000 (23:58 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours am:
162672a9f6 am:
9215fa05fe
am:
6757de98ca
Change-Id: I0ef1aea5d384a742e4b9acc7c55b60ad1bba1079
Wei Jia [Fri, 14 Jul 2017 23:58:32 +0000 (23:58 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f am:
b8dfff52ee am:
5445ddc983 -s ours am:
8700c26a91 -s ours am:
b063a7ea18
am:
92fce7ece7 -s ours
Change-Id: I229ef1d97dc56703a19530f0202fe2f2e0f6ad74
Wei Jia [Fri, 14 Jul 2017 23:54:33 +0000 (23:54 +0000)]
Merge "MPEG4Extractor: ensure returned status is checked." into nyc-dev am:
02772b134e am:
2aa463e371 am:
4fa11b6cdf am:
ae73886c4d
am:
447c686405
Change-Id: Ic055907befc7997969a14e6e5ad0314aacfe04af
Wei Jia [Fri, 14 Jul 2017 23:54:33 +0000 (23:54 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am:
80059d44c4 am:
72840f2216 am:
9e9987c46d am:
9583ca702a -s ours
am:
acf3c39437
Change-Id: Ibeb28073a468c0af7f76ea3c1976416c4c4fe84d
Wei Jia [Fri, 14 Jul 2017 23:54:33 +0000 (23:54 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours am:
162672a9f6
am:
9215fa05fe
Change-Id: Ia3dc7340a54e5dc27ce7bf6781052d7cb506d966
Wei Jia [Fri, 14 Jul 2017 23:54:32 +0000 (23:54 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f am:
b8dfff52ee am:
5445ddc983 -s ours am:
8700c26a91 -s ours
am:
b063a7ea18
Change-Id: I5075e05fa2c98f98197be580fc3640c884b9ba23
Wei Jia [Fri, 14 Jul 2017 23:50:35 +0000 (23:50 +0000)]
Merge "MPEG4Extractor: ensure returned status is checked." into nyc-dev am:
02772b134e am:
2aa463e371 am:
4fa11b6cdf
am:
ae73886c4d
Change-Id: I14a582f7890104d20ed8ad2336feaaf640d60bec
Wei Jia [Fri, 14 Jul 2017 23:50:35 +0000 (23:50 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours
am:
162672a9f6
Change-Id: Ibb5582e0c402221d6af88592ef261aeaafaf5f10
Wei Jia [Fri, 14 Jul 2017 23:50:32 +0000 (23:50 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am:
80059d44c4 am:
72840f2216 am:
9e9987c46d
am:
9583ca702a -s ours
Change-Id: Id8e5cbdcc0a9212f519677cb291c71c8a0d3fba1
Wei Jia [Fri, 14 Jul 2017 23:50:31 +0000 (23:50 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f am:
b8dfff52ee am:
5445ddc983 -s ours
am:
8700c26a91 -s ours
Change-Id: I08991c3961f9a820050d697a78a65ca70e728458
Wei Jia [Fri, 14 Jul 2017 23:42:36 +0000 (23:42 +0000)]
Merge "MPEG4Extractor: ensure returned status is checked." into nyc-dev am:
02772b134e am:
2aa463e371
am:
4fa11b6cdf
Change-Id: I199b2ac4365044bd8e901cc349fcbbc04fb4b5b8
Wei Jia [Fri, 14 Jul 2017 23:42:36 +0000 (23:42 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f am:
b8dfff52ee
am:
5445ddc983 -s ours
Change-Id: I556cccb83776d729f76b392192207637357f2292
Wei Jia [Fri, 14 Jul 2017 23:42:34 +0000 (23:42 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c
am:
74952e9616 -s ours
Change-Id: I7fb63cc1f5e74e9c909cf493960c7191af11ea93
Wei Jia [Fri, 14 Jul 2017 23:42:30 +0000 (23:42 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am:
80059d44c4 am:
72840f2216
am:
9e9987c46d
Change-Id: Id34116719e08a09de303d2fad907ce1072d0cb18
Wei Jia [Fri, 14 Jul 2017 23:38:32 +0000 (23:38 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f
am:
b8dfff52ee
Change-Id: I3a6b2ea30ba7b97b92eea98d80dd05db42e0dc11
Wei Jia [Fri, 14 Jul 2017 23:38:31 +0000 (23:38 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am:
80059d44c4
am:
72840f2216
Change-Id: I787c9a7bae1a0e5bf635ceb9ab3df59faea78f31
Wei Jia [Fri, 14 Jul 2017 23:38:31 +0000 (23:38 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours
am:
3092ed372c
Change-Id: I5f2b961f635981103348353c76ce8c58d3badfd2
Wei Jia [Fri, 14 Jul 2017 23:38:29 +0000 (23:38 +0000)]
Merge "MPEG4Extractor: ensure returned status is checked." into nyc-dev am:
02772b134e
am:
2aa463e371
Change-Id: Iba2670e0f394c1a8058008904d7cc4f01fe317a7
Wei Jia [Fri, 14 Jul 2017 23:34:32 +0000 (23:34 +0000)]
Merge "MPEG4Extractor: ensure returned status is checked." into nyc-dev
am:
02772b134e
Change-Id: If99cab67ff6f06551da5b6202d7d36c2854ff3a9
Wei Jia [Fri, 14 Jul 2017 23:34:32 +0000 (23:34 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev
am:
80059d44c4
Change-Id: I1d598f9f0bc506f2ea20b82d070ed69ec35876ee
Wei Jia [Fri, 14 Jul 2017 23:34:32 +0000 (23:34 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev
am:
da84963c1f
Change-Id: I979beafef27724be51e567fabc64b2b49ebb1a3b
Wei Jia [Fri, 14 Jul 2017 23:34:31 +0000 (23:34 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev
am:
61df326a5e -s ours
Change-Id: I0bf4804b128f23a8e8dbf2ed291d18a63468b488
Shuzhen Wang [Fri, 14 Jul 2017 22:14:19 +0000 (15:14 -0700)]
Camera: Fix "use after free" for mOutstandingBuffers
Fix below use after free issues:
==4947==ERROR: AddressSanitizer: heap-use-after-free on address
0xec61f434 at pc 0xf1954c18 bp 0xed3ff6f0 sp 0xed3ff6e8
READ of size 4 at 0xec61f434 thread T12 (C3Dev-1-ReqQueu)
#0 0xf1954c17 in _ZN7android7camera313Camera3Stream23removeOutstandingBufferERK21camera3_stream_buffer
frameworks/av/services/camera/libcameraservice/device3/Camera3Stream.cpp:508
#1 0xf1954c17 in _ZN7android7camera313Camera3Stream12returnBufferERK21camera3_stream_bufferx
frameworks/av/services/camera/libcameraservice/device3/Camera3Stream.cpp:543
#2 0xf193c663 in _ZN7android13Camera3Device13RequestThread21cleanUpFailedRequestsEb
frameworks/av/services/camera/libcameraservice/device3/Camera3Device.cpp:4131
#3 0xf193db5b in _ZN7android13Camera3Device13RequestThread10threadLoopEv
frameworks/av/services/camera/libcameraservice/device3/Camera3Device.cpp:3854
#4 0xf1562f35 in _ZN7android6Thread11_threadLoopEPv system/core/libutils/Threads.cpp:747
#5 0xf0ee6947 in _ZL15__pthread_startPv bionic/libc/bionic/pthread_create.cpp:214
#6 0xf0eba381 in __start_thread bionic/libc/bionic/clone.cpp:47
0xec61f434 is located 68 bytes inside of 136-byte region [0xec61f3f0,0xec61f478)
freed by thread T0 here:
#7 0xf1a64963 in _ZdlPvSt11align_val_tRKSt9nothrow_t [asan_rtl]
#8 0xf155df09 in _ZNK7android7RefBase9decStrongEPKv system/core/libutils/RefBase.cpp:435
#9 0xf19693ab in _ZN7android7camera319Camera3OutputStream22BufferReleasedListener16onBufferReleasedEv
frameworks/av/services/camera/libcameraservice/device3/Camera3OutputStream.cpp:720
#3 0x1ff56dfb (<unknown module>)
Bug:
62218367
Change-Id: Ib03415f73a1e3c283520af752904b1bcc40bff28
Wei Jia [Fri, 14 Jul 2017 23:27:21 +0000 (23:27 +0000)]
Merge "MPEG4Extractor: ensure returned status is checked." into nyc-dev
Wei Jia [Fri, 14 Jul 2017 23:26:43 +0000 (23:26 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev
Wei Jia [Fri, 14 Jul 2017 23:26:09 +0000 (23:26 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev
Wei Jia [Fri, 14 Jul 2017 23:25:32 +0000 (23:25 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev
Yin-Chia Yeh [Fri, 14 Jul 2017 22:19:30 +0000 (15:19 -0700)]
Camera: fix bufferFreed callback object lifecycle issue
Make sure the callback object won't be freed in the middle
of callback execution.
Test: CTS + stress test
Bug:
63683767
Change-Id: I6fb1b754cadb3d499c1c246687d2f60d444d00bb
jiabin [Thu, 13 Jul 2017 00:56:35 +0000 (17:56 -0700)]
Add parameters validation on AAudio MMap server
Bug:
63384314
Test: adb shell /system/bin/write_sine -m -pl -n4 \
&& adb shell /system/bin/write_sine -pl -n4 \
&& adb shell /system/bin/write_sine_callback -m -pl -n4 \
&& adb shell /system/bin/write_sine_callback -pl -n4 \
&& adb shell /system/bin/CtsNativeMediaAAudioTestCases32
Change-Id: I462f956e8fc25eb583699af6389e0f299243eafb
Hangyu Kuang [Fri, 14 Jul 2017 17:49:31 +0000 (10:49 -0700)]
media: Add more debug information to help timestamp debugging.
Test: Video Reocrding
Bug:
63627716
Change-Id: I9c91af46aaf29d9b0344c270d8c03b5f8c5d19b9
Yin-Chia Yeh [Fri, 14 Jul 2017 00:09:03 +0000 (00:09 +0000)]
Merge "Camera: fix buffer leak in device error condition" into oc-dr1-dev
am:
7bb115f103
Change-Id: I7f67785d81650c2dd15eaa10c59e4a110c68a47e
TreeHugger Robot [Fri, 14 Jul 2017 00:00:03 +0000 (00:00 +0000)]
Merge "Camera: fix buffer leak in device error condition" into oc-dr1-dev
Tom Cherry [Thu, 13 Jul 2017 22:51:59 +0000 (22:51 +0000)]
remove extraneous `using namespace android` and deprecate utils/Log.h am:
357552eb72
am:
8d0dd68b05
Change-Id: I49931f5a7becf28517e3801f6089fb720746a2ee
Tom Cherry [Thu, 13 Jul 2017 22:47:03 +0000 (22:47 +0000)]
remove extraneous `using namespace android` and deprecate utils/Log.h
am:
357552eb72
Change-Id: I36120c44e85c9ac35fb44e6f200b0f4341343b94
Tom Cherry [Wed, 12 Jul 2017 20:48:26 +0000 (13:48 -0700)]
remove extraneous `using namespace android` and deprecate utils/Log.h
This namespace is not used by this file and its declaration is removed
in a separate CL from utils/Log.h, which is the only place it is
defined, so we must remove this extraneous line.
Also, since that separate CL is deprecating utils/Log.h in favor of
log/log.h, we make the switch to the new header.
Test: Build
Exempt-From-Owner-Approval: Owners file needs updating
Change-Id: I34aa80765d30c79f8cb67eaf95a9995066bd672e
Phil Burk [Thu, 13 Jul 2017 18:42:10 +0000 (18:42 +0000)]
Merge "aaudio loopback: improve latency tester" into oc-dr1-dev
am:
ac31fb8978
Change-Id: I3cde7f8fa53cd7ac97a28691c0614f358b30e185
OSDN Git Service
