OSDN Git Service
Andy Hung [Wed, 18 Oct 2017 20:00:16 +0000 (20:00 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into lmp-dev am:
35a587cdc5 am:
27c4e661d4 -s ours am:
ac43fbe5a6 -s ours am:
f513923b38 -s ours am:
a421c87781 -s ours am:
310807ff52 -s ours am:
25c38b2f40 -s ours
am:
550c14e0a4 -s ours
Change-Id: I057cb93b31b4fb98372898a18baa5e1431ee20d7
Dongwon Kang [Wed, 18 Oct 2017 19:58:04 +0000 (19:58 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-mr1-dev am:
94c1663ec9 -s ours am:
5bc8146ac4 -s ours am:
e3c114277f -s ours am:
dce95dc139 -s ours am:
2388b54423 -s ours am:
9f03c8306c -s ours
am:
916f4ec913 -s ours
Change-Id: I7484df4a223ff4f3fbcb8a7c0172873207076ef4
Andy Hung [Wed, 18 Oct 2017 19:56:54 +0000 (19:56 +0000)]
Merge "EffectBundle: Check parameter and value size" into lmp-dev am:
57ad9301e7 am:
d566fb1cbf am:
7c5acccded am:
25bd563ea6 am:
652b0f30d7 am:
4adc519e51 am:
2ef36a4500
am:
13252cc9a1
Change-Id: I9683cb438916d2a6d87dfbc6c238e5e334c2c00e
Dongwon Kang [Wed, 18 Oct 2017 19:55:54 +0000 (19:55 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-dev am:
7b27979c5e -s ours am:
5095462e64 -s ours am:
12e787d348 -s ours am:
33d5c3961e -s ours am:
d4ebb1c11e -s ours am:
1e4f17cc7f -s ours am:
f683584e29 -s ours
am:
4a969bc360 -s ours
Change-Id: I7d9568debfbc8eabf7379ae6044c7437f7c2252d
Dongwon Kang [Wed, 18 Oct 2017 19:54:38 +0000 (19:54 +0000)]
Block allocateBackup if the node is not secure node. am:
996be3eef1 am:
2bebd9c7f5 am:
395ec8c4af am:
238f43188a am:
0a78e48503 am:
ff286981c5 -s ours am:
d7d971edb4 -s ours
am:
6f8cfdcb21 -s ours
Change-Id: I8a7830f36370423c37aee4b325ea18d1c49471a2
Andy Hung [Wed, 18 Oct 2017 19:32:40 +0000 (19:32 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into lmp-dev am:
35a587cdc5 am:
27c4e661d4 -s ours am:
ac43fbe5a6 -s ours am:
f513923b38 -s ours am:
a421c87781 -s ours am:
310807ff52 -s ours
am:
25c38b2f40 -s ours
Change-Id: Idb4443b3fa613f38e8f6987a4537c7b874cdb8b7
Dongwon Kang [Wed, 18 Oct 2017 19:31:30 +0000 (19:31 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-mr1-dev am:
94c1663ec9 -s ours am:
5bc8146ac4 -s ours am:
e3c114277f -s ours am:
dce95dc139 -s ours am:
2388b54423 -s ours
am:
9f03c8306c -s ours
Change-Id: I9c5b41e0607194674b24a0fcccc1b1c509d8229e
Andy Hung [Wed, 18 Oct 2017 19:30:37 +0000 (19:30 +0000)]
Merge "EffectBundle: Check parameter and value size" into lmp-dev am:
57ad9301e7 am:
d566fb1cbf am:
7c5acccded am:
25bd563ea6 am:
652b0f30d7 am:
4adc519e51
am:
2ef36a4500
Change-Id: I198c546497b3e571d3f21aacf4bd1b25bdbe7a06
Dongwon Kang [Wed, 18 Oct 2017 19:29:31 +0000 (19:29 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-dev am:
7b27979c5e -s ours am:
5095462e64 -s ours am:
12e787d348 -s ours am:
33d5c3961e -s ours am:
d4ebb1c11e -s ours am:
1e4f17cc7f -s ours
am:
f683584e29 -s ours
Change-Id: I02d6e6339ab477d752a5c38f40891f907fea6010
Dongwon Kang [Wed, 18 Oct 2017 19:28:40 +0000 (19:28 +0000)]
Block allocateBackup if the node is not secure node. am:
996be3eef1 am:
2bebd9c7f5 am:
395ec8c4af am:
238f43188a am:
0a78e48503 am:
ff286981c5 -s ours
am:
d7d971edb4 -s ours
Change-Id: I3ec108a50ed00f9d87e9ef67e08d6a02770d9f64
Andy Hung [Wed, 18 Oct 2017 19:17:58 +0000 (19:17 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into lmp-dev am:
35a587cdc5 am:
27c4e661d4 -s ours am:
ac43fbe5a6 -s ours am:
f513923b38 -s ours am:
a421c87781 -s ours
am:
310807ff52 -s ours
Change-Id: I4ccdd7901825f76976b5a2ba32926452c7d045d2
Dongwon Kang [Wed, 18 Oct 2017 19:16:39 +0000 (19:16 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-mr1-dev am:
94c1663ec9 -s ours am:
5bc8146ac4 -s ours am:
e3c114277f -s ours am:
dce95dc139 -s ours
am:
2388b54423 -s ours
Change-Id: I1a8647c09e683c7dd079d3fb3ade517338017e69
Andy Hung [Wed, 18 Oct 2017 19:15:40 +0000 (19:15 +0000)]
Merge "EffectBundle: Check parameter and value size" into lmp-dev am:
57ad9301e7 am:
d566fb1cbf am:
7c5acccded am:
25bd563ea6 am:
652b0f30d7
am:
4adc519e51
Change-Id: Ib14971bc13f26578e257c068838b95eb58db1f32
Dongwon Kang [Wed, 18 Oct 2017 19:14:28 +0000 (19:14 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-dev am:
7b27979c5e -s ours am:
5095462e64 -s ours am:
12e787d348 -s ours am:
33d5c3961e -s ours am:
d4ebb1c11e -s ours
am:
1e4f17cc7f -s ours
Change-Id: I04b37697e1e4fc99db496e90638a270e1d2827e5
Dongwon Kang [Wed, 18 Oct 2017 19:13:28 +0000 (19:13 +0000)]
Block allocateBackup if the node is not secure node. am:
996be3eef1 am:
2bebd9c7f5 am:
395ec8c4af am:
238f43188a am:
0a78e48503
am:
ff286981c5 -s ours
Change-Id: I6e0e50caf54dff752c31c86fa99d1ff5f30359c1
Andy Hung [Wed, 18 Oct 2017 19:08:11 +0000 (19:08 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into lmp-dev am:
35a587cdc5 am:
27c4e661d4 -s ours am:
ac43fbe5a6 -s ours am:
f513923b38 -s ours
am:
a421c87781 -s ours
Change-Id: I2b7a23bfad407e2123721d3276d3bfa6b9f0ee1f
Dongwon Kang [Wed, 18 Oct 2017 19:07:16 +0000 (19:07 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-mr1-dev am:
94c1663ec9 -s ours am:
5bc8146ac4 -s ours am:
e3c114277f -s ours
am:
dce95dc139 -s ours
Change-Id: I25cbcfb675a2d7f45e7002c81fb53de0cbfad94b
Andy Hung [Wed, 18 Oct 2017 19:06:14 +0000 (19:06 +0000)]
Merge "EffectBundle: Check parameter and value size" into lmp-dev am:
57ad9301e7 am:
d566fb1cbf am:
7c5acccded am:
25bd563ea6
am:
652b0f30d7
Change-Id: I89a806810ccf83879cb9f1c1c3c6010915ae5535
Dongwon Kang [Wed, 18 Oct 2017 19:05:21 +0000 (19:05 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-dev am:
7b27979c5e -s ours am:
5095462e64 -s ours am:
12e787d348 -s ours am:
33d5c3961e -s ours
am:
d4ebb1c11e -s ours
Change-Id: I7699dcd9415aa3940015d47e3f380c44b8c0367c
Dongwon Kang [Wed, 18 Oct 2017 19:03:27 +0000 (19:03 +0000)]
Block allocateBackup if the node is not secure node. am:
996be3eef1 am:
2bebd9c7f5 am:
395ec8c4af am:
238f43188a
am:
0a78e48503
Change-Id: I75bd01c40825a2f52a3c03d6b3b07c35bb5609e4
Andy Hung [Wed, 18 Oct 2017 18:52:07 +0000 (18:52 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into lmp-dev am:
35a587cdc5 am:
27c4e661d4 -s ours am:
ac43fbe5a6 -s ours
am:
f513923b38 -s ours
Change-Id: I281533c1337341e069c6215649d140b38c7a2029
Dongwon Kang [Wed, 18 Oct 2017 18:48:36 +0000 (18:48 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-mr1-dev am:
94c1663ec9 -s ours am:
5bc8146ac4 -s ours
am:
e3c114277f -s ours
Change-Id: I1e01e4135e81f9c3c03596aaae5f4611056c23dd
Andy Hung [Wed, 18 Oct 2017 18:47:48 +0000 (18:47 +0000)]
Merge "EffectBundle: Check parameter and value size" into lmp-dev am:
57ad9301e7 am:
d566fb1cbf am:
7c5acccded
am:
25bd563ea6
Change-Id: Ia8a8cc2fba258473f62bcecfd1b415de58b6ed00
Dongwon Kang [Wed, 18 Oct 2017 18:46:24 +0000 (18:46 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-dev am:
7b27979c5e -s ours am:
5095462e64 -s ours am:
12e787d348 -s ours
am:
33d5c3961e -s ours
Change-Id: I9bd93131f8da871a8184d47dae0645c48efce017
Dongwon Kang [Wed, 18 Oct 2017 18:45:22 +0000 (18:45 +0000)]
Block allocateBackup if the node is not secure node. am:
996be3eef1 am:
2bebd9c7f5 am:
395ec8c4af
am:
238f43188a
Change-Id: Ica1d840bbd7bcaa08c86f9d748f09acb0f40d2c5
Andy Hung [Wed, 18 Oct 2017 18:35:17 +0000 (18:35 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into lmp-dev am:
35a587cdc5 am:
27c4e661d4 -s ours
am:
ac43fbe5a6 -s ours
Change-Id: I152ad67ad96a5c094af84514e24cc4fadb785cdc
Dongwon Kang [Wed, 18 Oct 2017 18:34:34 +0000 (18:34 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-mr1-dev am:
94c1663ec9 -s ours
am:
5bc8146ac4 -s ours
Change-Id: I4919d6fc77956c06372b7b892b70901a9ae98ce6
Andy Hung [Wed, 18 Oct 2017 18:33:19 +0000 (18:33 +0000)]
Merge "EffectBundle: Check parameter and value size" into lmp-dev am:
57ad9301e7 am:
d566fb1cbf
am:
7c5acccded
Change-Id: Ic08b036eadb5d1c10bed355c98f63b8d94771287
Dongwon Kang [Wed, 18 Oct 2017 18:32:30 +0000 (18:32 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-dev am:
7b27979c5e -s ours am:
5095462e64 -s ours
am:
12e787d348 -s ours
Change-Id: Id74cae01703bb13af49f11bc05b017316dc4597f
Dongwon Kang [Wed, 18 Oct 2017 18:31:27 +0000 (18:31 +0000)]
Block allocateBackup if the node is not secure node. am:
996be3eef1 am:
2bebd9c7f5
am:
395ec8c4af
Change-Id: Ie9b80adf4b9e628d2b02c539ea93724b19e7e9c3
Andy Hung [Wed, 18 Oct 2017 18:20:41 +0000 (18:20 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into lmp-dev am:
35a587cdc5
am:
27c4e661d4 -s ours
Change-Id: Ieeabc519b9d49792374fad19eacb7b3d7d33d506
Dongwon Kang [Wed, 18 Oct 2017 18:19:46 +0000 (18:19 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-mr1-dev
am:
94c1663ec9 -s ours
Change-Id: I371842b7ade30644d6d1d2beddf07208999bedb3
Andy Hung [Wed, 18 Oct 2017 18:18:33 +0000 (18:18 +0000)]
Merge "EffectBundle: Check parameter and value size" into lmp-dev am:
57ad9301e7
am:
d566fb1cbf
Change-Id: I9e6c1bce51509a9bac5f4337670ccd28940b2902
Dongwon Kang [Wed, 18 Oct 2017 18:16:19 +0000 (18:16 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-dev am:
7b27979c5e -s ours
am:
5095462e64 -s ours
Change-Id: I844a85ba7abc7590e0225a8b3bb8a93b08d14210
Dongwon Kang [Wed, 18 Oct 2017 18:14:09 +0000 (18:14 +0000)]
Block allocateBackup if the node is not secure node. am:
996be3eef1
am:
2bebd9c7f5
Change-Id: I39938bca7730ae2ade30a8154a2e16d94072d503
Wei Jia [Tue, 10 Oct 2017 22:41:24 +0000 (22:41 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am:
46e359cbc0 am:
1fad937a9c am:
7b66ddb747 am:
6c15ae2aa9 -s ours am:
41392611b5
am:
0b6424a441
Change-Id: I37a115a1778d1852401427cd2a7c16299c8c60f4
Marco Nelissen [Tue, 10 Oct 2017 22:40:41 +0000 (22:40 +0000)]
Don't CHECK if the source can't be started am:
711f83fa6c am:
c3f16a62a2 am:
0ada8e950b am:
efcbb62657 -s ours am:
769a422071
am:
4797f02aee
Change-Id: I27dea01e8c38ea4768043d5b1f1075e75fe36581
Wei Jia [Tue, 10 Oct 2017 22:33:02 +0000 (22:33 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am:
46e359cbc0 am:
1fad937a9c am:
7b66ddb747 am:
6c15ae2aa9 -s ours
am:
41392611b5
Change-Id: I5a120cc1fc60d9e4d47efe4c953286eb8dc6b3f2
Marco Nelissen [Tue, 10 Oct 2017 22:32:13 +0000 (22:32 +0000)]
Don't CHECK if the source can't be started am:
711f83fa6c am:
c3f16a62a2 am:
0ada8e950b am:
efcbb62657 -s ours
am:
769a422071
Change-Id: I78f95557dfa60537f1a8da92b6c5f8668f18a4c8
Wei Jia [Tue, 10 Oct 2017 22:22:16 +0000 (22:22 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am:
46e359cbc0 am:
1fad937a9c am:
7b66ddb747
am:
6c15ae2aa9 -s ours
Change-Id: I100024372f76521ea697a7742dba8ac064e972cc
Marco Nelissen [Tue, 10 Oct 2017 22:21:58 +0000 (22:21 +0000)]
Don't CHECK if the source can't be started am:
711f83fa6c am:
c3f16a62a2 am:
0ada8e950b
am:
efcbb62657 -s ours
Change-Id: I418cd498a25c0a1670ab1ba52c5e85ced779c3e0
Eric Laurent [Tue, 10 Oct 2017 22:01:19 +0000 (22:01 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am:
dbda8a95eb
am:
7f0263ba2d
Change-Id: I1777f119f17e359bead997c1bd043e1554c5125c
Marco Nelissen [Tue, 10 Oct 2017 21:57:23 +0000 (21:57 +0000)]
Merge changes from topic "
b23270724" into nyc-dev am:
45a05eb567
am:
e79b2f044c -s ours
Change-Id: I39d12c1761c74291eead9f98fc3a7409a79b2c43
Eric Laurent [Tue, 10 Oct 2017 21:30:46 +0000 (21:30 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev
am:
dbda8a95eb
Change-Id: I325b9ad452b2ee6da8368ad5951fc37cad80723f
Eric Laurent [Tue, 10 Oct 2017 21:21:31 +0000 (21:21 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev
Wei Jia [Tue, 10 Oct 2017 21:15:33 +0000 (21:15 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am:
46e359cbc0 am:
1fad937a9c
am:
7b66ddb747
Change-Id: I70c6a85ff698c487031aed697a880ab0c5e62769
Marco Nelissen [Tue, 10 Oct 2017 21:14:35 +0000 (21:14 +0000)]
Don't CHECK if the source can't be started am:
711f83fa6c am:
c3f16a62a2
am:
0ada8e950b
Change-Id: I0a88ce1fa0a73966d2c1a61e1ff70d0f30d711ae
Wei Jia [Tue, 10 Oct 2017 21:10:51 +0000 (21:10 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am:
46e359cbc0
am:
1fad937a9c
Change-Id: If2da3bc028a3dd7bcbbb96ac1abe567e2ba71f86
Marco Nelissen [Tue, 10 Oct 2017 21:09:54 +0000 (21:09 +0000)]
Don't CHECK if the source can't be started am:
711f83fa6c
am:
c3f16a62a2
Change-Id: Ie546935111a19ca0ff157e8bffb95dffd7ed8a46
Wei Jia [Tue, 10 Oct 2017 21:02:53 +0000 (21:02 +0000)]
MediaExtractor: ensure users to check returned value by getTrack.
am:
46e359cbc0
Change-Id: I4a953b55c86be7590e7cf54b01b01c26e98aba19
Marco Nelissen [Tue, 10 Oct 2017 21:02:10 +0000 (21:02 +0000)]
Merge changes from topic "
b23270724" into nyc-dev
am:
45a05eb567
Change-Id: Iee4799062b31b85d92fd2a1ca9ca1000839bc7e6
Marco Nelissen [Tue, 10 Oct 2017 21:01:59 +0000 (21:01 +0000)]
Don't CHECK if the source can't be started
am:
711f83fa6c
Change-Id: Ib21b34c2c9707cfeb9a20a31417c84c9af8a585e
TreeHugger Robot [Tue, 10 Oct 2017 20:56:11 +0000 (20:56 +0000)]
Merge changes from topic "
b23270724" into nyc-dev
* changes:
Handle idle->loaded state transition when loaded->idle is still in progress
IMediaExtractor: ensure users to check returned value by getTrack.
Don't CHECK if the source can't be started
Fix issues with extractor dumpsys
Eric Laurent [Thu, 5 Oct 2017 17:58:38 +0000 (10:58 -0700)]
Soundtrigger service: fix cross deadlock with audio policy service
Do not hold Module mutex when calling into audio policy manager to
avoid cross deadlock with audio poicy service mutex: Audio policy manager
can call into sound trigger service with its mutex held in methods like
stopInput().
Regression introduced by fix for b/
64340921 commit
f759b8c4
Bug:
64340921
Bug:
67310830
Test: repro steps in b/
67310830
Merged-In: Ie50b2e7c55fe9828a3fd8de6b31eb4a492791583
Change-Id: Ie50b2e7c55fe9828a3fd8de6b31eb4a492791583
Julien Desprez [Tue, 26 Sep 2017 17:17:59 +0000 (17:17 +0000)]
Revert "Make stagefright command available for STS tests." am:
4197479539
am:
8dc2a5fdfb
Change-Id: I2679093d7a32ac111cf674dc357ac32853a99b81
Julien Desprez [Tue, 26 Sep 2017 17:15:31 +0000 (17:15 +0000)]
Revert "Make stagefright command available for STS tests."
am:
4197479539
Change-Id: I3fd20c38c33720d6e0824022976fb2db21eb6419
Julien Desprez [Tue, 26 Sep 2017 17:02:21 +0000 (17:02 +0000)]
Revert "Make stagefright command available for STS tests."
Bug:
66943976
This reverts commit
e286ff463b46ca987562adc9b24d49f1ee191b92.
Change-Id: I9704307962d86e82baf0215b60fadeaa1cc470df
Andres Celis [Mon, 25 Sep 2017 22:27:19 +0000 (22:27 +0000)]
Make stagefright command available for STS tests. am:
e286ff463b
am:
ef136ff97e
Change-Id: I64167e4b7aaca441a13d33667a519c0ffd8899d2
Andres Celis [Mon, 25 Sep 2017 22:24:49 +0000 (22:24 +0000)]
Make stagefright command available for STS tests.
am:
e286ff463b
Change-Id: I3ad4b941d5aebce2bf33f621b872e9ce0dc72ac1
Andres Celis [Wed, 20 Sep 2017 20:24:48 +0000 (13:24 -0700)]
Make stagefright command available for STS tests.
Bug:
65246490
Change-Id: If34d5e625181bd81bc112b1c9b519b2c0891740b
Marco Nelissen [Thu, 1 Sep 2016 22:11:57 +0000 (15:11 -0700)]
Handle idle->loaded state transition when loaded->idle is still in progress
Bug:
31156921
Bug:
23270724
Change-Id: I926cab482fadecb8bb885d85e0d083a4501596fd
Wei Jia [Fri, 28 Apr 2017 17:20:07 +0000 (10:20 -0700)]
IMediaExtractor: ensure users to check returned value by getTrack.
Test: fix the crash from the stream in the bug.
Bug:
37777357
Bug:
23270724
Change-Id: Ia99907c396a2074a9419db9b8103a9325b290169
Marco Nelissen [Thu, 1 Sep 2016 20:12:24 +0000 (13:12 -0700)]
Don't CHECK if the source can't be started
Bug:
19779574
Bug:
31156921
Bug:
23270724
Change-Id: I770619949ed211dab301ee3da10069d319279715
Marco Nelissen [Mon, 19 Dec 2016 22:06:30 +0000 (14:06 -0800)]
Fix issues with extractor dumpsys
Tracks and descriptions were added to their respective lists in
opposite order, so dumpsys could mix up the format and active
state for a given track. Also fix potential NULL pointer dereference.
Bug:
33179012
Bug:
23270724
Change-Id: I700d535da0e72f5641bf9257a34fdb5d5d068b12
Wei Jia [Fri, 28 Apr 2017 17:20:07 +0000 (10:20 -0700)]
MediaExtractor: ensure users to check returned value by getTrack.
Test: fix the crash from the stream in the bug.
Bug:
37777357
Change-Id: Ia99907c396a2074a9419db9b8103a9325b290169
Marco Nelissen [Thu, 1 Sep 2016 20:12:24 +0000 (13:12 -0700)]
Don't CHECK if the source can't be started
Bug:
19779574
Bug:
31156921
Change-Id: I770619949ed211dab301ee3da10069d319279715
Wonsik Kim [Wed, 13 Sep 2017 21:32:58 +0000 (21:32 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev am:
7fad4bb2da am:
18b22afe7a am:
e42227983a am:
f669386ff9 am:
af6aa6e3fa
am:
773023ddbd
Change-Id: Icb6d1e4e353b2f43b9d1539621379a5dffd84e27
Wonsik Kim [Wed, 13 Sep 2017 21:08:31 +0000 (21:08 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev am:
7fad4bb2da am:
18b22afe7a am:
e42227983a am:
f669386ff9
am:
af6aa6e3fa
Change-Id: I0fa9c9fe48ded649de267f9387a2f483b1555ebb
Marco Nelissen [Wed, 13 Sep 2017 20:36:28 +0000 (20:36 +0000)]
Merge "media: Fix a typo in parsing nclc atom." into nyc-dev am:
08ef71975b
am:
d6768a3f03
Change-Id: Iafba587d46764fb47a425d602172cb1c82636d52
Wonsik Kim [Wed, 13 Sep 2017 20:20:48 +0000 (20:20 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev am:
7fad4bb2da am:
18b22afe7a am:
e42227983a
am:
f669386ff9
Change-Id: I15571eb5c05ea0bbf77ec5a746c989d84f38ccee
Wonsik Kim [Wed, 13 Sep 2017 20:14:48 +0000 (20:14 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev am:
7fad4bb2da am:
18b22afe7a
am:
e42227983a
Change-Id: I9613239a8e331d3a1811ca35bba3baf3ab819abe
Wonsik Kim [Wed, 13 Sep 2017 20:11:29 +0000 (20:11 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev am:
7fad4bb2da
am:
18b22afe7a
Change-Id: Ib5d83c4bca072150c4a85905895088de4bdb8bf0
Wonsik Kim [Wed, 13 Sep 2017 20:08:20 +0000 (20:08 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev
am:
7fad4bb2da
Change-Id: I9d7c50eab930c2d6a3aadf9bc0685d6ccf870cb0
Marco Nelissen [Wed, 13 Sep 2017 20:08:06 +0000 (20:08 +0000)]
Merge "media: Fix a typo in parsing nclc atom." into nyc-dev
am:
08ef71975b
Change-Id: I73ec3365c21238f7ca328763df52121b43911e04
Wonsik Kim [Wed, 13 Sep 2017 16:41:29 +0000 (16:41 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev
Marco Nelissen [Wed, 13 Sep 2017 05:01:24 +0000 (05:01 +0000)]
Merge "media: Fix a typo in parsing nclc atom." into nyc-dev
Andy Hung [Tue, 12 Sep 2017 01:30:39 +0000 (01:30 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into lmp-dev
am:
35a587cdc5
Change-Id: I673c315dadc97b06ceb75d552c22e3ce5e0629bc
Andy Hung [Tue, 12 Sep 2017 00:58:24 +0000 (00:58 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into lmp-dev
Andy Hung [Mon, 11 Sep 2017 22:21:26 +0000 (22:21 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100 am:
0a8a0c4474 am:
ae465be454 am:
b995c31415 am:
d08327d1a2
am:
74f84d987b
Change-Id: Ie2c1acfdc523c6774dd2f90e0b42a9f274731d57
Andy Hung [Mon, 11 Sep 2017 22:17:17 +0000 (22:17 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100 am:
0a8a0c4474 am:
ae465be454 am:
b995c31415
am:
d08327d1a2
Change-Id: Ia8bdb1eae19450a3c6df255945a8cded55b15909
Andy Hung [Mon, 11 Sep 2017 22:15:47 +0000 (22:15 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100 am:
0a8a0c4474 am:
ae465be454
am:
b995c31415
Change-Id: Iff099acd6ee928f37d2b91144a06d9c78a2a5aae
Andy Hung [Mon, 11 Sep 2017 22:13:42 +0000 (22:13 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100 am:
0a8a0c4474
am:
ae465be454
Change-Id: I272012f714615091a24a9d3bf8a0d2d825576bcf
Andy Hung [Mon, 11 Sep 2017 22:12:13 +0000 (22:12 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100
am:
0a8a0c4474
Change-Id: Icf690ebbc582d61f4369ef208aa150e2aa0c38d7
Andy Hung [Mon, 11 Sep 2017 22:10:43 +0000 (22:10 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev
am:
e472e51100
Change-Id: I82f359a057762b8b0fac97d137a2fb20083a518b
TreeHugger Robot [Mon, 11 Sep 2017 22:03:19 +0000 (22:03 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-mr1-dev
Andy Hung [Mon, 11 Sep 2017 22:01:44 +0000 (22:01 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev
Hangyu Kuang [Fri, 19 Aug 2016 20:49:43 +0000 (13:49 -0700)]
media: Fix a typo in parsing nclc atom.
Bug:
30974361
bug:
64836941
Change-Id: I12a75ed30d3259d863e744fae3ccff79d8a95f39
(cherry picked from commit
51a0ff56f49faf1a19281f6d786fe18bf84794c6)
Andy Hung [Mon, 11 Sep 2017 19:22:23 +0000 (19:22 +0000)]
Merge "EffectBundle: Check parameter and value size" into lmp-dev
am:
57ad9301e7
Change-Id: Ie783b9a68e25f4a90f02936608114fc89ab788a6
Andy Hung [Mon, 11 Sep 2017 18:40:03 +0000 (18:40 +0000)]
Merge "EffectBundle: Check parameter and value size" into lmp-dev
Dongwon Kang [Wed, 30 Aug 2017 23:55:26 +0000 (16:55 -0700)]
Track graphic buffer mode in OMXNodeInstance
Test: cts-tradefed run cts -p android.media & YT & Play Movies & Cast
Bug:
62948670
Merged-In: Icbd9b767f1aef005819e680f77f4a05041988f34
Change-Id: Icbd9b767f1aef005819e680f77f4a05041988f34
Dongwon Kang [Mon, 11 Sep 2017 17:28:50 +0000 (17:28 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-dev
am:
7b27979c5e -s ours
Change-Id: I02cadfefbea7da31716904c6530bd0f1fe52cf8a
Dongwon Kang [Mon, 11 Sep 2017 17:07:13 +0000 (17:07 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev am:
659a498ca0 am:
e77ea73939 am:
410f48c5e3 am:
57c83e2226 -s ours am:
177ee220b9 -s ours
am:
c66d4db705 -s ours
Change-Id: Id1e1ec84d35e12a3ae7ee0e991bcf7729a5e4377
Dongwon Kang [Mon, 11 Sep 2017 17:03:14 +0000 (17:03 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev am:
659a498ca0 am:
e77ea73939 am:
410f48c5e3 am:
57c83e2226 -s ours
am:
177ee220b9 -s ours
Change-Id: I674316a0d0ad9ff64efdb3593d5da3b2d8183a28
Dongwon Kang [Mon, 11 Sep 2017 16:59:44 +0000 (16:59 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev am:
659a498ca0 am:
e77ea73939 am:
410f48c5e3
am:
57c83e2226 -s ours
Change-Id: Id48471463e916b66034956540ffcef7341ac9a9b
Dongwon Kang [Mon, 11 Sep 2017 16:56:15 +0000 (16:56 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev am:
659a498ca0 am:
e77ea73939
am:
410f48c5e3
Change-Id: I57d9148bfc3ced57c2b12453f68e45d40523034f
Dongwon Kang [Mon, 11 Sep 2017 16:52:42 +0000 (16:52 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev am:
659a498ca0
am:
e77ea73939
Change-Id: Ia635461b9881a8d74d48f55c2bb0ccf50c2a1383
Dongwon Kang [Mon, 11 Sep 2017 16:49:18 +0000 (16:49 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev
am:
659a498ca0
Change-Id: If10318296ec8fbb5448e37e639ca5b031db5a912
Dongwon Kang [Mon, 11 Sep 2017 16:49:14 +0000 (16:49 +0000)]
Block allocateBackup if the node is not secure node.
am:
996be3eef1
Change-Id: Ib79c7d8d079da2da2cd7742a089ee66a1fe8efd4
Dongwon Kang [Mon, 11 Sep 2017 16:41:41 +0000 (16:41 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into nyc-dev am:
df11b20fd3
am:
fbaadabfdf
Change-Id: I740abcbf02ddfcb7d61747396b75fd2dcaf1920d
Dongwon Kang [Mon, 11 Sep 2017 16:38:18 +0000 (16:38 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into nyc-dev
am:
df11b20fd3
Change-Id: I3410126b00d0ab7436633ebc858d4153b2ba3d7c
OSDN Git Service
