OSDN Git Service
Wei Jia [Tue, 10 Oct 2017 23:19:32 +0000 (23:19 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am:
46e359cbc0 am:
1fad937a9c am:
7b66ddb747 am:
6c15ae2aa9 -s ours am:
41392611b5 am:
0b6424a441 am:
b9e0bdb6e8 am:
1d242fdfff
am:
c8ab764e51
Change-Id: Icb9afd4abcdca6b64fdedbb5dbf5f468d9d88130
Marco Nelissen [Tue, 10 Oct 2017 23:14:17 +0000 (23:14 +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 am:
d951771d27 am:
bd9ffb2a77
am:
da86840b7b
Change-Id: I67fa80e2f3da716d86a4a08ec25b795036a6524e
Wei Jia [Tue, 10 Oct 2017 23:07:06 +0000 (23:07 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am:
46e359cbc0 am:
1fad937a9c am:
7b66ddb747 am:
6c15ae2aa9 -s ours am:
41392611b5 am:
0b6424a441 am:
b9e0bdb6e8
am:
1d242fdfff
Change-Id: Ifac6eee45c655b843f782ce732643f44dd0dd986
Marco Nelissen [Tue, 10 Oct 2017 23:05:51 +0000 (23:05 +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 am:
d951771d27
am:
bd9ffb2a77
Change-Id: I7eb4c7d04b7c51fc5a8fa230cfc1db03829760c7
Wei Jia [Tue, 10 Oct 2017 22:56:46 +0000 (22:56 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am:
46e359cbc0 am:
1fad937a9c am:
7b66ddb747 am:
6c15ae2aa9 -s ours am:
41392611b5 am:
0b6424a441
am:
b9e0bdb6e8
Change-Id: Id003ce3e6655581041f2a427408b177f1235f431
Marco Nelissen [Tue, 10 Oct 2017 22:54:58 +0000 (22:54 +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
am:
d951771d27
Change-Id: I7345add98dd4856771587bd5b42179fe76bf5032
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
Eric Laurent [Tue, 10 Oct 2017 22:22:05 +0000 (22:22 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am:
dbda8a95eb am:
7f0263ba2d am:
31ac3bd137 am:
830bbb259e
am:
960f0f335e -s ours
Change-Id: I9e99134af75cc2f03eaec7e8686ee1ab04c678ed
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
Marco Nelissen [Tue, 10 Oct 2017 22:18:25 +0000 (22:18 +0000)]
Merge changes from topic "
b23270724" into nyc-dev am:
45a05eb567 am:
e79b2f044c -s ours am:
4758facf28 am:
db1e02306c
am:
32d62af8e0
Change-Id: I9f59f0429fdbb0e6bc6607b3e757fc1ac8f017b1
Eric Laurent [Tue, 10 Oct 2017 22:17:24 +0000 (22:17 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am:
dbda8a95eb am:
7f0263ba2d am:
31ac3bd137
am:
830bbb259e
Change-Id: Ibd1f49311e7315b67d361c1ac48bbb436e4cf1d7
Marco Nelissen [Tue, 10 Oct 2017 22:09:54 +0000 (22:09 +0000)]
Merge changes from topic "
b23270724" into nyc-dev am:
45a05eb567 am:
e79b2f044c -s ours am:
4758facf28
am:
db1e02306c
Change-Id: I81c93c34c33f32ff0ebd471a9e91b8e8a230abaa
Eric Laurent [Tue, 10 Oct 2017 22:08:14 +0000 (22:08 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am:
dbda8a95eb am:
7f0263ba2d
am:
31ac3bd137
Change-Id: Ia824880f1020c46b30989325d154f88134cbdaed
Marco Nelissen [Tue, 10 Oct 2017 22:04:53 +0000 (22:04 +0000)]
Merge changes from topic "
b23270724" into nyc-dev am:
45a05eb567 am:
e79b2f044c -s ours
am:
4758facf28
Change-Id: Ie6a6ff729b8d5461f86a7ab9e3dbb6f04f4659b5
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
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
Phil Burk [Tue, 12 Sep 2017 23:42:44 +0000 (16:42 -0700)]
aaudio: disable MMAP mode by not creating AAudioService
Only Legacy mode will work, which uses AudioFlinger.
Note that another CL with the same ID in oc-mr1-dev is used to prevent
AAudio MMAP from being disabled in MR1 and master.
Bug:
65280854
Bug:
65262790
Test: See bugs. Any attempt to use MMAP will fail to open the service.
Merged-In: Ic68d136c99c16134aa704495311ab25285fd76a9
Change-Id: Ic68d136c99c16134aa704495311ab25285fd76a9
Julien Desprez [Tue, 26 Sep 2017 17:24:32 +0000 (17:24 +0000)]
Revert "Make stagefright command available for STS tests." am:
4197479539 am:
8dc2a5fdfb am:
af93be238f am:
35c28bb88f
am:
c2b8b3f072
Change-Id: I90cce4197d2537e4821607c9948f07086e51f070
Julien Desprez [Tue, 26 Sep 2017 17:22:29 +0000 (17:22 +0000)]
Revert "Make stagefright command available for STS tests." am:
4197479539 am:
8dc2a5fdfb am:
af93be238f
am:
35c28bb88f
Change-Id: I2971472558c986121f134bde112ca57829d19cea
Julien Desprez [Tue, 26 Sep 2017 17:20:31 +0000 (17:20 +0000)]
Revert "Make stagefright command available for STS tests." am:
4197479539 am:
8dc2a5fdfb
am:
af93be238f
Change-Id: Id023ae01a22e71617b898c8ce2c65ccae6ca295a
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:35:49 +0000 (22:35 +0000)]
Make stagefright command available for STS tests. am:
e286ff463b am:
ef136ff97e am:
80a9c17582 am:
15052a13c1
am:
c29da42e23
Change-Id: I02da406a30367840f32d2112d1b4dc7f2babaeb2
Andres Celis [Mon, 25 Sep 2017 22:31:20 +0000 (22:31 +0000)]
Make stagefright command available for STS tests. am:
e286ff463b am:
ef136ff97e am:
80a9c17582
am:
15052a13c1
Change-Id: I9d74a9914420bbf71203f8c79ad09eeca77e3d2f
Andres Celis [Mon, 25 Sep 2017 22:29:19 +0000 (22:29 +0000)]
Make stagefright command available for STS tests. am:
e286ff463b am:
ef136ff97e
am:
80a9c17582
Change-Id: I41d392a8930721fce8359a6814d8db8ff7859d5f
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 23:24:52 +0000 (23:24 +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 am:
29cd6b306a am:
4e7855e9e2
am:
8d352347c8
Change-Id: Iab2873e344de58dbefa77311d847dccc2f3f346a
Marco Nelissen [Wed, 13 Sep 2017 23:23:55 +0000 (23:23 +0000)]
Merge "media: Fix a typo in parsing nclc atom." into nyc-dev am:
08ef71975b am:
d6768a3f03 am:
6705aadd4b am:
04cb1d7f53
am:
57f4543970
Change-Id: I9360a01c8a10eac5523f7307366d232e711ae23d
Wonsik Kim [Wed, 13 Sep 2017 22:28:53 +0000 (22:28 +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 am:
29cd6b306a
am:
4e7855e9e2
Change-Id: I052aa674864234641ded2b160aaa89f5747c7c18
Marco Nelissen [Wed, 13 Sep 2017 22:28:23 +0000 (22:28 +0000)]
Merge "media: Fix a typo in parsing nclc atom." into nyc-dev am:
08ef71975b am:
d6768a3f03 am:
6705aadd4b
am:
04cb1d7f53
Change-Id: Ib2773de7e003ab14d18e5b8c8f70e4800e0cfc63
Wonsik Kim [Wed, 13 Sep 2017 21:51:29 +0000 (21:51 +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
am:
29cd6b306a
Change-Id: I5dbd868f25eb1b135e58ea9b5031fdb80da9a1f3
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:47:25 +0000 (20:47 +0000)]
Merge "media: Fix a typo in parsing nclc atom." into nyc-dev am:
08ef71975b am:
d6768a3f03
am:
6705aadd4b
Change-Id: Idadacc9024cb424c771f546b4a9bdec6fff7c6b4
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 [Mon, 11 Sep 2017 22:33:46 +0000 (22:33 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100 am:
0a8a0c4474 am:
ae465be454 am:
b995c31415 am:
d08327d1a2 am:
74f84d987b am:
355a18f58d am:
c8f3cf02eb
am:
8cad724158
Change-Id: I1d0102e75a068bd6a2af21b9126b907703928db7
Andy Hung [Mon, 11 Sep 2017 22:32:15 +0000 (22:32 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100 am:
0a8a0c4474 am:
ae465be454 am:
b995c31415 am:
d08327d1a2 am:
74f84d987b am:
355a18f58d
am:
c8f3cf02eb
Change-Id: I7c984be87df715dbc6fe5ecc44691e001d7ff09f
Andy Hung [Mon, 11 Sep 2017 22:24:48 +0000 (22:24 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100 am:
0a8a0c4474 am:
ae465be454 am:
b995c31415 am:
d08327d1a2 am:
74f84d987b
am:
355a18f58d
Change-Id: I5f3a24175f1aa70fb1f8d62a449685e9103cad18
TreeHugger Robot [Mon, 11 Sep 2017 22:24:09 +0000 (22:24 +0000)]
Merge "Put media.metrics service into proper group" into oc-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
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)
Ray Essick [Thu, 7 Sep 2017 19:34:50 +0000 (12:34 -0700)]
Put media.metrics service into proper group
specify a group for the media.metrics service.
the unspecified default is inappropriate.
Bug:
65334712
Bug:
65540999
Test: examination of /proc info for metrics
Change-Id: I0e35a2d676586216bcfee672666803b7fa5eae4d
(cherry picked from commit
a61dff07b71b6999f30c2a15268d8a4d87d4ce48)
Dongwon Kang [Mon, 11 Sep 2017 17:17:16 +0000 (17:17 +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 am:
6b936f54ff -s ours am:
75612faf76 -s ours
am:
e06a7d69ca -s ours
Change-Id: Iae608559bb37e15da1287113b7f82a9446020996
Dongwon Kang [Mon, 11 Sep 2017 17:13:52 +0000 (17:13 +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 am:
6b936f54ff -s ours
am:
75612faf76 -s ours
Change-Id: Iad00100a6e9b8f79a648c7a35b57d41d7fafdcfb
Dongwon Kang [Mon, 11 Sep 2017 17:10:15 +0000 (17:10 +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
am:
6b936f54ff -s ours
Change-Id: I28559dc35dc859153adc69563b529c74f324a5e7
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:53:11 +0000 (16:53 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into nyc-dev am:
df11b20fd3 am:
fbaadabfdf am:
3e2eac8b68 am:
0c799a519f
am:
2a3f4e31ee -s ours
Change-Id: I3b0343bb57ce02886bc322f726ba684ab6bf3979
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:52:39 +0000 (16:52 +0000)]
Block allocateBufferWithBackup in secure native handle mode am:
528c7dd7c2 am:
9b14c30565 am:
9f7e205a80 am:
9eeb7cb2fd
am:
5c1e5ec1b2 -s ours
Change-Id: I232e634625b7f3d6a05e0737ca636b8e6a47e0d2
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:15 +0000 (16:49 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into nyc-dev am:
df11b20fd3 am:
fbaadabfdf am:
3e2eac8b68
am:
0c799a519f
Change-Id: Ic526f0640f99a7c71eec90bf866479cc7e3b3963
Dongwon Kang [Mon, 11 Sep 2017 16:45:16 +0000 (16:45 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into nyc-dev am:
df11b20fd3 am:
fbaadabfdf
am:
3e2eac8b68
Change-Id: Ia127d32339353934323bc776d24a6b15225c3332
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:41:38 +0000 (16:41 +0000)]
Block allocateBufferWithBackup in secure native handle mode am:
528c7dd7c2 am:
9b14c30565 am:
9f7e205a80
am:
9eeb7cb2fd
Change-Id: I63631c29a43fa5b0fad0bd626138328f7e63b50e
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
Dongwon Kang [Mon, 11 Sep 2017 16:38:08 +0000 (16:38 +0000)]
Block allocateBufferWithBackup in secure native handle mode am:
528c7dd7c2 am:
9b14c30565
am:
9f7e205a80
Change-Id: Ifa7f56a0f34b5cf9068f804b5a97beb018ee4aec
Andy Hung [Mon, 11 Sep 2017 16:36:50 +0000 (16:36 +0000)]
Merge "EffectBundle: Check parameter and value size" into oc-dev
Dongwon Kang [Mon, 11 Sep 2017 16:35:30 +0000 (16:35 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev
Dongwon Kang [Mon, 11 Sep 2017 16:34:59 +0000 (16:34 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into nyc-dev