OSDN Git Service
Phil Burk [Sat, 21 Apr 2018 00:24:38 +0000 (17:24 -0700)]
RESTRICT AUTOMERGE: aaudio: fix FIFO wrapround frame counts
The number of frames in the second part was incorrect
when it wrapped past the end of the FIFO.
Bug:
78139448
Bug:
120789744
Test: adb shell aaudio_loopback -c2 -C2 -tm -m2 -Pl -pn
Change-Id: Ib6a22f30f0ee5321444c6d6137d9488943c34f3d
ray-cy.lee [Tue, 25 Sep 2018 05:21:22 +0000 (22:21 -0700)]
[automerger] CTS error while media dump() am:
c20825bd3b am:
8a530ca738 am:
ef7415221a am:
8cc5e57576 am:
2ab6f28542 am:
cf264f7d64
am:
093bba3a2e
Change-Id: Ia67c2130f5fedbc280b0e55903a38b0accc97f93
ray-cy.lee [Tue, 25 Sep 2018 05:16:05 +0000 (22:16 -0700)]
[automerger] CTS error while media dump() am:
c20825bd3b am:
8a530ca738 am:
ef7415221a am:
8cc5e57576 am:
2ab6f28542
am:
cf264f7d64
Change-Id: I20c9dd975ea8f9a41cd6bc7a9eedff26e945188a
Android Build Merger (Role) [Tue, 11 Sep 2018 18:09:07 +0000 (18:09 +0000)]
[automerger] CTS error while media dump() am:
c20825bd3b am:
8a530ca738 am:
ef7415221a am:
8cc5e57576 am:
2ab6f28542
Change-Id: I39fcd04b17ad4af558bd37410e6cbdcdba783213
Android Build Merger (Role) [Tue, 11 Sep 2018 18:09:05 +0000 (18:09 +0000)]
[automerger] CTS error while media dump() am:
c20825bd3b am:
8a530ca738 am:
ef7415221a am:
8cc5e57576
Change-Id: Ic30487f023a17d487170aaf8199aa12d1f85d805
Android Build Merger (Role) [Tue, 11 Sep 2018 18:09:04 +0000 (18:09 +0000)]
[automerger] CTS error while media dump() am:
c20825bd3b am:
8a530ca738 am:
ef7415221a
Change-Id: Ia36c4117a3e49cafeffef3fb8e030e818e05571b
Android Build Merger (Role) [Tue, 11 Sep 2018 18:09:02 +0000 (18:09 +0000)]
[automerger] CTS error while media dump() am:
c20825bd3b am:
8a530ca738
Change-Id: Ibcd8860289456ce0fce9fd1a7376508ffef06b2e
Android Build Merger (Role) [Tue, 11 Sep 2018 18:09:00 +0000 (18:09 +0000)]
[automerger] CTS error while media dump() am:
c20825bd3b
Change-Id: I749052142196bbaa9168db64ec8ff50df84b41e0
ray-cy.lee [Tue, 7 Mar 2017 10:25:15 +0000 (18:25 +0800)]
CTS error while media dump()
MediaExtractor should not dump information. CTS is
checking and failing due to the dump.
Bug:
114770654
Change-Id: Ie5bae5de39545dede6da4198240b4f38c50050b7
Chong Zhang [Wed, 5 Sep 2018 18:13:02 +0000 (11:13 -0700)]
[automerger skipped] Fix race condition for cas sessions -- DO NOT MERGE am:
c927af1287
am:
ebbcb99ca1 -s ours
Change-Id: Ic07e59b4c05abcc70018d912a8f0cabd52cbf3a5
Chong Zhang [Wed, 5 Sep 2018 18:05:48 +0000 (11:05 -0700)]
Fix race condition for cas sessions -- DO NOT MERGE
am:
c927af1287
Change-Id: I1c84f2fd3d49a7e784b2b44d20453796d070df8d
Chong Zhang [Fri, 24 Aug 2018 21:49:33 +0000 (14:49 -0700)]
Fix race condition for cas sessions -- DO NOT MERGE
Change the session to shared_ptr and use atomic_load/store.
Test: POC; CTS MediaCasTest; CTS MediaDrmClearkeyTest#
testClearKeyPlaybackMpeg2ts
bug:
113027383
Change-Id: I75f4cb33a022f28d45918442d64c5c46df2640ef
Chong Zhang [Fri, 24 Aug 2018 21:49:33 +0000 (14:49 -0700)]
Fix race condition for cas sessions -- DO NOT MERGE
Change the session to shared_ptr and use atomic_load/store.
Test: POC; CTS MediaCasTest; CTS MediaDrmClearkeyTest#
testClearKeyPlaybackMpeg2ts
bug:
113027383
Change-Id: I75f4cb33a022f28d45918442d64c5c46df2640ef
Jeff Tinker [Wed, 15 Aug 2018 12:06:03 +0000 (05:06 -0700)]
[automerger] Fix information disclosure in mediadrmserver DO NOT MERGE am:
ecb2df5bc0 am:
c88022c3de am:
eea2ec03a4 am:
949bb98535 skipped:
1e3a02a61c am:
0b127b39f5
am:
feeda6ddb0
Change-Id: I5b74913b0d90ed40651f8e2d276bfb4f80e0d4ce
Jeff Tinker [Wed, 15 Aug 2018 08:44:59 +0000 (01:44 -0700)]
[automerger] Fix information disclosure in mediadrmserver DO NOT MERGE am:
ecb2df5bc0 am:
c88022c3de am:
eea2ec03a4 am:
949bb98535 skipped:
1e3a02a61c
am:
0b127b39f5
Change-Id: Iffead21fcb5bd624ee95160faec39eb02ad8d981
Jeff Tinker [Wed, 15 Aug 2018 04:20:16 +0000 (21:20 -0700)]
Merge "Fix information disclosure in mediadrmserver" into oc-dev am:
f452267ae8
am:
dd57ac5b26
Change-Id: I6bf2cbd05b71fc09320de267c89210319be427a6
Android Build Merger (Role) [Wed, 15 Aug 2018 03:06:13 +0000 (03:06 +0000)]
[automerger] Fix information disclosure in mediadrmserver DO NOT MERGE am:
ecb2df5bc0 am:
c88022c3de am:
eea2ec03a4 am:
949bb98535 skipped:
1e3a02a61c
Change-Id: Iee5d340f7a878129ed8118fcf40291b7ca0040d7
Android Build Merger (Role) [Wed, 15 Aug 2018 03:06:11 +0000 (03:06 +0000)]
[automerger] Fix information disclosure in mediadrmserver DO NOT MERGE am:
ecb2df5bc0 am:
c88022c3de am:
eea2ec03a4 am:
949bb98535
Change-Id: I52549e142d262a3c32996d2a70b86963e1e79a37
Android Build Merger (Role) [Wed, 15 Aug 2018 03:06:10 +0000 (03:06 +0000)]
[automerger] Fix information disclosure in mediadrmserver DO NOT MERGE am:
ecb2df5bc0 am:
c88022c3de am:
eea2ec03a4
Change-Id: I1b459a5507a259d12ee1bb7c8a94870554bc1ca4
Android Build Merger (Role) [Wed, 15 Aug 2018 03:06:08 +0000 (03:06 +0000)]
[automerger] Fix information disclosure in mediadrmserver DO NOT MERGE am:
ecb2df5bc0 am:
c88022c3de
Change-Id: I216ce9065f3a5ecd26add57b7f9bad8d16fe330d
Android Build Merger (Role) [Wed, 15 Aug 2018 03:06:06 +0000 (03:06 +0000)]
[automerger] Fix information disclosure in mediadrmserver DO NOT MERGE am:
ecb2df5bc0
Change-Id: Iba22b0efec9ee75ee535c10a0415b4a1e70adfb0
Jeff Tinker [Fri, 13 Jul 2018 23:58:04 +0000 (16:58 -0700)]
Fix information disclosure in mediadrmserver DO NOT MERGE
Test:POC provided in bug
Bug:
79218474
Change-Id: Ida9323dc1939e3c6e9fffe302bc8284d181817a7
Jeff Tinker [Wed, 15 Aug 2018 01:11:33 +0000 (18:11 -0700)]
Merge "Fix information disclosure in mediadrmserver" into oc-dev
am:
f452267ae8
Change-Id: I96ab0c115e78c10930a9bd12837b422f8cd8bce5
TreeHugger Robot [Tue, 14 Aug 2018 23:49:37 +0000 (23:49 +0000)]
Merge "Fix information disclosure in mediadrmserver" into oc-dev
Marco Nelissen [Tue, 14 Aug 2018 17:30:37 +0000 (10:30 -0700)]
[automerger] Check for overflow of crypto size am:
d1fd027612 am:
fe8dc06116 am:
1d1379f47d am:
7b432adb13 am:
4572777872 am:
1b227ecd31
am:
960c43e6f5
Change-Id: I25778ee7a8acbafcb9fe4249fd2c8857612bb180
Marco Nelissen [Tue, 14 Aug 2018 17:21:28 +0000 (10:21 -0700)]
[automerger] Check for overflow of crypto size am:
d1fd027612 am:
fe8dc06116 am:
1d1379f47d am:
7b432adb13 am:
4572777872
am:
1b227ecd31
Change-Id: Iac94e76d0c99846da1b1b9cc2dbef180640eec1a
Android Build Merger (Role) [Wed, 1 Aug 2018 17:33:17 +0000 (17:33 +0000)]
[automerger] Check for overflow of crypto size am:
d1fd027612 am:
fe8dc06116 am:
1d1379f47d am:
7b432adb13 am:
4572777872
Change-Id: I61f454707ead459e64c810548032c99856b96467
Android Build Merger (Role) [Wed, 1 Aug 2018 17:33:15 +0000 (17:33 +0000)]
[automerger] Check for overflow of crypto size am:
d1fd027612 am:
fe8dc06116 am:
1d1379f47d am:
7b432adb13
Change-Id: Id71c686d3c894e1b1dbab0ff01432698a41981f4
Android Build Merger (Role) [Wed, 1 Aug 2018 17:33:14 +0000 (17:33 +0000)]
[automerger] Check for overflow of crypto size am:
d1fd027612 am:
fe8dc06116 am:
1d1379f47d
Change-Id: I909560dad9565c5113c8432842934b66971ff511
Android Build Merger (Role) [Wed, 1 Aug 2018 17:33:12 +0000 (17:33 +0000)]
[automerger] Check for overflow of crypto size am:
d1fd027612 am:
fe8dc06116
Change-Id: I9d6534a3b64e57922cf033b70535b7d2544f1cf2
Android Build Merger (Role) [Wed, 1 Aug 2018 17:33:09 +0000 (17:33 +0000)]
[automerger] Check for overflow of crypto size am:
d1fd027612
Change-Id: I065fd02eeebfacd1e525bf52d0b17787ab8db9b2
Marco Nelissen [Tue, 31 Jul 2018 22:12:51 +0000 (15:12 -0700)]
Check for overflow of crypto size
Bug:
111603051
Test: CTS
Change-Id: Ib5b1802b9b35769a25c16e2b977308cf7a810606
Jeff Tinker [Tue, 24 Jul 2018 21:13:13 +0000 (14:13 -0700)]
Fix information disclosure in mediadrmserver
Test:POC provided in bug
Bug:
79218474
Change-Id: Iba12c07a5e615f8ed234b01ac53e3559ba9ac12e
Robert Shih [Sat, 14 Jul 2018 08:06:09 +0000 (01:06 -0700)]
Merge changes from topic "am-
3d7d15cb-f02b-474d-adb3-
adb7e033539e" into oc-dev am:
11eddd5a22
am:
9353b051f9
Change-Id: Idc0ff3824ed1bf9b7cca41702379a79bf12544f2
Robert Shih [Sat, 14 Jul 2018 06:36:54 +0000 (23:36 -0700)]
Merge changes from topic "am-
3d7d15cb-f02b-474d-adb3-
adb7e033539e" into oc-dev
am:
11eddd5a22
Change-Id: Iabc41876ce5fd26e5383586d76f5f4c9b920b055
Robert Shih [Sat, 14 Jul 2018 06:23:21 +0000 (06:23 +0000)]
Merge changes from topic "am-
3d7d15cb-f02b-474d-adb3-
adb7e033539e" into oc-dev
* changes:
[automerger] M3UParser: handle missing EXT-X-MEDIA URIs am:
b8c3a74de5 am:
a3acb4c0f2 am:
b7b790ef84 am:
17ae208764 am:
c60f2ff6b4
[automerger] M3UParser: handle missing EXT-X-MEDIA URIs am:
b8c3a74de5 am:
a3acb4c0f2 am:
b7b790ef84 am:
17ae208764
[automerger] M3UParser: handle missing EXT-X-MEDIA URIs am:
b8c3a74de5 am:
a3acb4c0f2 am:
b7b790ef84
[automerger] M3UParser: handle missing EXT-X-MEDIA URIs am:
b8c3a74de5 am:
a3acb4c0f2
[automerger] M3UParser: handle missing EXT-X-MEDIA URIs am:
b8c3a74de5
M3UParser: handle missing EXT-X-MEDIA URIs
Toshikazu Saito [Sat, 14 Jul 2018 00:06:00 +0000 (17:06 -0700)]
Allow kPortModeDynamicANWBuffer for kBufferTypeANWBuffer in useBuffer am:
d8cbab1443
am:
0eaa9ea8b3
Change-Id: If2b503b048cb98e5b4ea851e43e821baf86e91a3
Toshikazu Saito [Fri, 13 Jul 2018 22:42:41 +0000 (15:42 -0700)]
Allow kPortModeDynamicANWBuffer for kBufferTypeANWBuffer in useBuffer
am:
d8cbab1443
Change-Id: I20857d5d8a057fb5eb6ef19d6b9b5a18fcc43144
Android Build Merger (Role) [Fri, 13 Jul 2018 08:24:17 +0000 (08:24 +0000)]
[automerger] M3UParser: handle missing EXT-X-MEDIA URIs am:
b8c3a74de5 am:
a3acb4c0f2 am:
b7b790ef84 am:
17ae208764 am:
c60f2ff6b4
Change-Id: I4f5b1eec29da19eb35d8bda966bda6352950a2d8
Android Build Merger (Role) [Fri, 13 Jul 2018 08:24:15 +0000 (08:24 +0000)]
[automerger] M3UParser: handle missing EXT-X-MEDIA URIs am:
b8c3a74de5 am:
a3acb4c0f2 am:
b7b790ef84 am:
17ae208764
Change-Id: I98a69cea4885bd3b2a1c81801d51545c5bca1144
Android Build Merger (Role) [Fri, 13 Jul 2018 08:24:13 +0000 (08:24 +0000)]
[automerger] M3UParser: handle missing EXT-X-MEDIA URIs am:
b8c3a74de5 am:
a3acb4c0f2 am:
b7b790ef84
Change-Id: I3f2bc0ae278e3353c6849c02eae543bb8a62e3f2
Android Build Merger (Role) [Fri, 13 Jul 2018 08:24:11 +0000 (08:24 +0000)]
[automerger] M3UParser: handle missing EXT-X-MEDIA URIs am:
b8c3a74de5 am:
a3acb4c0f2
Change-Id: I4cb61df3694d28593a6ba5da948ec470b0416b64
Android Build Merger (Role) [Fri, 13 Jul 2018 08:24:10 +0000 (08:24 +0000)]
[automerger] M3UParser: handle missing EXT-X-MEDIA URIs am:
b8c3a74de5
Change-Id: I3eb6d9c776064ab65b9966afde17887ef7f751b1
Robert Shih [Thu, 12 Jul 2018 23:17:45 +0000 (16:17 -0700)]
M3UParser: handle missing EXT-X-MEDIA URIs
Bug:
111381540
Test: http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8
Change-Id: I57f6cea59ce4c25267385289ab805eefe74b04ac
Toshikazu Saito [Tue, 10 Jul 2018 06:38:38 +0000 (15:38 +0900)]
Allow kPortModeDynamicANWBuffer for kBufferTypeANWBuffer in useBuffer
Test: play contents
Bug:
77486542
Change-Id: I422d49a137889c417d855ebef954f882f67821ed
Atanas Kirilov [Wed, 11 Jul 2018 23:02:40 +0000 (16:02 -0700)]
Merge changes from topic "am-
79da5bca-0ca6-42a8-8b95-
7ab98d864152" into oc-dev am:
48dcdf9a78
am:
448b966b7a
Change-Id: I8bfef4e2a056761a53224985f47cad9f502ad9de
Atanas Kirilov [Wed, 11 Jul 2018 22:56:13 +0000 (15:56 -0700)]
Merge changes from topic "am-
79da5bca-0ca6-42a8-8b95-
7ab98d864152" into oc-dev
am:
48dcdf9a78
Change-Id: I6694213e5c47fe1d206a07b0086fb20eef68983e
Atanas Kirilov [Wed, 11 Jul 2018 22:45:05 +0000 (22:45 +0000)]
Merge changes from topic "am-
79da5bca-0ca6-42a8-8b95-
7ab98d864152" into oc-dev
* changes:
[automerger] MediaExtractor: stop rendering when an error occurs am:
9bc021a323 am:
d04d54f843 am:
73bc1230e7 am:
70c597fe88 am:
0bfabbf53d
[automerger] MediaExtractor: stop rendering when an error occurs am:
9bc021a323 am:
d04d54f843 am:
73bc1230e7 am:
70c597fe88
[automerger] MediaExtractor: stop rendering when an error occurs am:
9bc021a323 am:
d04d54f843 am:
73bc1230e7
[automerger] MediaExtractor: stop rendering when an error occurs am:
9bc021a323 am:
d04d54f843
[automerger] MediaExtractor: stop rendering when an error occurs am:
9bc021a323
MediaExtractor: stop rendering when an error occurs
Atanas Kirilov [Wed, 11 Jul 2018 22:45:05 +0000 (22:45 +0000)]
Merge changes from topic "am-
79da5bca-0ca6-42a8-8b95-
7ab98d864152" into nyc-mr2-dev
* changes:
[automerger] MediaExtractor: stop rendering when an error occurs am:
9bc021a323 am:
d04d54f843 am:
73bc1230e7 am:
70c597fe88
[automerger] MediaExtractor: stop rendering when an error occurs am:
9bc021a323 am:
d04d54f843 am:
73bc1230e7
[automerger] MediaExtractor: stop rendering when an error occurs am:
9bc021a323 am:
d04d54f843
[automerger] MediaExtractor: stop rendering when an error occurs am:
9bc021a323
MediaExtractor: stop rendering when an error occurs
Atanas Kirilov [Wed, 11 Jul 2018 22:45:05 +0000 (22:45 +0000)]
Merge changes from topic "am-
79da5bca-0ca6-42a8-8b95-
7ab98d864152" into cw-f-dev
* changes:
[automerger] MediaExtractor: stop rendering when an error occurs am:
9bc021a323 am:
d04d54f843 am:
73bc1230e7
[automerger] MediaExtractor: stop rendering when an error occurs am:
9bc021a323 am:
d04d54f843
[automerger] MediaExtractor: stop rendering when an error occurs am:
9bc021a323
MediaExtractor: stop rendering when an error occurs
Atanas Kirilov [Wed, 11 Jul 2018 22:45:05 +0000 (22:45 +0000)]
Merge changes from topic "am-
79da5bca-0ca6-42a8-8b95-
7ab98d864152" into nyc-mr1-dev
* changes:
[automerger] MediaExtractor: stop rendering when an error occurs am:
9bc021a323 am:
d04d54f843
[automerger] MediaExtractor: stop rendering when an error occurs am:
9bc021a323
MediaExtractor: stop rendering when an error occurs
Atanas Kirilov [Wed, 11 Jul 2018 22:45:05 +0000 (22:45 +0000)]
Merge changes from topic "am-
79da5bca-0ca6-42a8-8b95-
7ab98d864152" into nyc-dr1-dev
* changes:
[automerger] MediaExtractor: stop rendering when an error occurs am:
9bc021a323
MediaExtractor: stop rendering when an error occurs
Atanas Kirilov [Wed, 11 Jul 2018 22:45:05 +0000 (22:45 +0000)]
Merge "MediaExtractor: stop rendering when an error occurs" into nyc-dev
Dongwon Kang [Wed, 11 Jul 2018 20:10:53 +0000 (13:10 -0700)]
[automerger] Fix a race condition in OMXNodeInstance am:
fe3708f7ba am:
dce12d183a am:
ad0ec9b3af am:
fc7a3a56f9 am:
25e9dff25c am:
e8d5d152bf am:
1ff39c654a am:
e5d3086f3b am:
301a0078a8 am:
77c35f6cac
am:
22eab8fecd
Change-Id: Id2135d79c7293256c74e6966f6add4bbdccb0621
Dongwon Kang [Wed, 11 Jul 2018 20:06:44 +0000 (13:06 -0700)]
[automerger] Fix a race condition in OMXNodeInstance am:
fe3708f7ba am:
dce12d183a am:
ad0ec9b3af am:
fc7a3a56f9 am:
25e9dff25c am:
e8d5d152bf am:
1ff39c654a am:
e5d3086f3b am:
301a0078a8
am:
77c35f6cac
Change-Id: I161ecd32a392f05dd535496ec119f5252fb77fc9
Android Build Merger (Role) [Tue, 10 Jul 2018 20:13:52 +0000 (20:13 +0000)]
[automerger] MediaExtractor: stop rendering when an error occurs am:
9bc021a323 am:
d04d54f843 am:
73bc1230e7 am:
70c597fe88 am:
0bfabbf53d
Change-Id: Ie57297887fb1bb7c851731592f62089aaee11837
Android Build Merger (Role) [Tue, 10 Jul 2018 20:13:50 +0000 (20:13 +0000)]
[automerger] MediaExtractor: stop rendering when an error occurs am:
9bc021a323 am:
d04d54f843 am:
73bc1230e7 am:
70c597fe88
Change-Id: Iea1a919b03258d7d5653788feddc7e53461a16c9
Android Build Merger (Role) [Tue, 10 Jul 2018 20:13:48 +0000 (20:13 +0000)]
[automerger] MediaExtractor: stop rendering when an error occurs am:
9bc021a323 am:
d04d54f843 am:
73bc1230e7
Change-Id: I1ea228f53f99030fbf846a694b02e74f56159a94
Android Build Merger (Role) [Tue, 10 Jul 2018 20:13:46 +0000 (20:13 +0000)]
[automerger] MediaExtractor: stop rendering when an error occurs am:
9bc021a323 am:
d04d54f843
Change-Id: If7842c0575c4283518e15230d5550356dffe5021
Android Build Merger (Role) [Tue, 10 Jul 2018 20:13:44 +0000 (20:13 +0000)]
[automerger] MediaExtractor: stop rendering when an error occurs am:
9bc021a323
Change-Id: I5c235031af2cf5c23bc37a0922a8f8836de28202
akirilov [Mon, 9 Jul 2018 22:28:01 +0000 (15:28 -0700)]
MediaExtractor: stop rendering when an error occurs
Bug:
68664359
Bug:
110435401
Test: cts-tradefed run cts -m CtsSecurityTestCases -t android.security.cts.StagefrightTest#testStagefright_bug_68664359
Test: cts-tradefed run cts -m CtsSecurityTestCases -t android.security.cts.StagefrightTest#testStagefright_bug_110435401
Change-Id: Icff96fcaa76a5871e7f175b0384d47d5dca7313f
Merged-In: If1322524fcfebc6c5f139288f044b0189da66c1b
Android Build Merger (Role) [Thu, 21 Jun 2018 00:02:12 +0000 (00:02 +0000)]
[automerger] Fix a race condition in OMXNodeInstance am:
fe3708f7ba am:
dce12d183a am:
ad0ec9b3af am:
fc7a3a56f9 am:
25e9dff25c am:
e8d5d152bf am:
1ff39c654a am:
e5d3086f3b am:
301a0078a8
Change-Id: I6983d28e45c047ffb3b7db9a6d02240c5746eec3
Android Build Merger (Role) [Thu, 21 Jun 2018 00:02:10 +0000 (00:02 +0000)]
[automerger] Fix a race condition in OMXNodeInstance am:
fe3708f7ba am:
dce12d183a am:
ad0ec9b3af am:
fc7a3a56f9 am:
25e9dff25c am:
e8d5d152bf am:
1ff39c654a am:
e5d3086f3b
Change-Id: I7c847f620deb25930874f676b81c09d34d5f5f72
Android Build Merger (Role) [Thu, 21 Jun 2018 00:02:08 +0000 (00:02 +0000)]
[automerger] Fix a race condition in OMXNodeInstance am:
fe3708f7ba am:
dce12d183a am:
ad0ec9b3af am:
fc7a3a56f9 am:
25e9dff25c am:
e8d5d152bf am:
1ff39c654a
Change-Id: I9a6766cd10724fd73e97ac633c835d70b07fdb4d
Android Build Merger (Role) [Thu, 21 Jun 2018 00:02:06 +0000 (00:02 +0000)]
[automerger] Fix a race condition in OMXNodeInstance am:
fe3708f7ba am:
dce12d183a am:
ad0ec9b3af am:
fc7a3a56f9 am:
25e9dff25c am:
e8d5d152bf
Change-Id: Ibd4d21d5826d9a072b5ab04ece651291c73e98de
Android Build Merger (Role) [Thu, 21 Jun 2018 00:02:03 +0000 (00:02 +0000)]
[automerger] Fix a race condition in OMXNodeInstance am:
fe3708f7ba am:
dce12d183a am:
ad0ec9b3af am:
fc7a3a56f9 am:
25e9dff25c
Change-Id: I1152e6a6052862f54489fc48be76bde57120068d
Android Build Merger (Role) [Thu, 21 Jun 2018 00:02:01 +0000 (00:02 +0000)]
[automerger] Fix a race condition in OMXNodeInstance am:
fe3708f7ba am:
dce12d183a am:
ad0ec9b3af am:
fc7a3a56f9
Change-Id: I9e321e4bd090b976dda07829bec093008ac59966
Android Build Merger (Role) [Thu, 21 Jun 2018 00:01:59 +0000 (00:01 +0000)]
[automerger] Fix a race condition in OMXNodeInstance am:
fe3708f7ba am:
dce12d183a am:
ad0ec9b3af
Change-Id: Ia83dfb602b091c512653eb83d7aa43b1c6e44cf2
Android Build Merger (Role) [Thu, 21 Jun 2018 00:01:57 +0000 (00:01 +0000)]
[automerger] Fix a race condition in OMXNodeInstance am:
fe3708f7ba am:
dce12d183a
Change-Id: I8aa8cb36c18fea386753f1f5160f7b7499358cac
Android Build Merger (Role) [Thu, 21 Jun 2018 00:01:55 +0000 (00:01 +0000)]
[automerger] Fix a race condition in OMXNodeInstance am:
fe3708f7ba
Change-Id: I6b438d3fd0cdbf8d4f85a7e2c053be1c5cbd5e82
Dongwon Kang [Wed, 20 Jun 2018 23:05:45 +0000 (16:05 -0700)]
Fix a race condition in OMXNodeInstance
When it frees the buffers, there might be pending events in
OMX::CallbackDispatcher and these event can be handled after
the component frees the buffers. To prevent the UAF case, this
change invalidates the buffers in the client side first before
calling OMX_FreeBuffer.
Test: run poc with and without the patch
Test: cts-tradefed run cts-dev --module CtsMediaTestCases
--compatibility:module-arg CtsMediaTestCases:include-annotation:
android.platform.test.annotations.RequiresDevice
Bug:
77474014
Change-Id: I0b7c4291967564f697e7f6a5ecbc31d4dae3cbcd
Marco Nelissen [Tue, 5 Jun 2018 22:42:20 +0000 (15:42 -0700)]
Merge changes from topic "am-
92cbb3f7-167f-4f57-b682-
f916686fead9-mnc-dev" into oc-dev am:
91abb3dac8
am:
767b86ffd7
Change-Id: I72134b3fad1810eb2081e9061be774736fbf9036
Sanjay Singh [Tue, 5 Jun 2018 22:40:34 +0000 (15:40 -0700)]
Merge "OMXNodeInstance: Allow dynamic native handle mode for input buffers" into oc-dev am:
e41dfae5d5
am:
e877bf1ba7
Change-Id: I4b69d97ee171ad4ed68fcb76e5b633a2e805b463
Robert Shih [Tue, 5 Jun 2018 22:30:23 +0000 (15:30 -0700)]
[automerger] M3UParser: make url on demand am:
26e236bd42 am:
042483b6ad am:
9500a5c893 am:
6fac86e8f4 am:
cc3897e95b am:
a333901a90 am:
b5029cb717 am:
e143e026ce am:
5673ef3ece am:
29efa36532
am:
4e5ada70a5
Change-Id: I96f6f21ae01717188d1714c16ed6996e63d72d1c
Marco Nelissen [Tue, 5 Jun 2018 21:49:51 +0000 (14:49 -0700)]
Merge changes from topic "am-
92cbb3f7-167f-4f57-b682-
f916686fead9-mnc-dev" into oc-dev
am:
91abb3dac8
Change-Id: I436b0361983489182d5910aab2e81230674ed8c6
Sanjay Singh [Tue, 5 Jun 2018 21:39:05 +0000 (14:39 -0700)]
Merge "OMXNodeInstance: Allow dynamic native handle mode for input buffers" into oc-dev
am:
e41dfae5d5
Change-Id: Ib857ac1561aa8cffd22574fb7a8f76869e67b903
Marco Nelissen [Tue, 5 Jun 2018 21:39:01 +0000 (21:39 +0000)]
Merge changes from topic "am-
92cbb3f7-167f-4f57-b682-
f916686fead9-mnc-dev" into oc-dev
* changes:
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5 am:
bad0533d2e am:
19d1113bb0 am:
8aeab2cad9 am:
b04ca4cb26 am:
9cae8be448
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5 am:
bad0533d2e am:
19d1113bb0 am:
8aeab2cad9 am:
b04ca4cb26
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5 am:
bad0533d2e am:
19d1113bb0 am:
8aeab2cad9
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5 am:
bad0533d2e am:
19d1113bb0
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5 am:
bad0533d2e
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86
[automerger] Fix possible out of bounds read am:
3762e06152
Fix possible out of bounds read
Marco Nelissen [Tue, 5 Jun 2018 21:39:01 +0000 (21:39 +0000)]
Merge changes from topic "am-
92cbb3f7-167f-4f57-b682-
f916686fead9-mnc-dev" into nyc-mr2-dev
* changes:
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5 am:
bad0533d2e am:
19d1113bb0 am:
8aeab2cad9 am:
b04ca4cb26
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5 am:
bad0533d2e am:
19d1113bb0 am:
8aeab2cad9
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5 am:
bad0533d2e am:
19d1113bb0
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5 am:
bad0533d2e
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86
[automerger] Fix possible out of bounds read am:
3762e06152
Fix possible out of bounds read
Marco Nelissen [Tue, 5 Jun 2018 21:39:01 +0000 (21:39 +0000)]
Merge changes from topic "am-
92cbb3f7-167f-4f57-b682-
f916686fead9-mnc-dev" into cw-f-dev
* changes:
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5 am:
bad0533d2e am:
19d1113bb0 am:
8aeab2cad9
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5 am:
bad0533d2e am:
19d1113bb0
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5 am:
bad0533d2e
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86
[automerger] Fix possible out of bounds read am:
3762e06152
Fix possible out of bounds read
Marco Nelissen [Tue, 5 Jun 2018 21:39:01 +0000 (21:39 +0000)]
Merge changes from topic "am-
92cbb3f7-167f-4f57-b682-
f916686fead9-mnc-dev" into nyc-mr1-dev
* changes:
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5 am:
bad0533d2e am:
19d1113bb0
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5 am:
bad0533d2e
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86
[automerger] Fix possible out of bounds read am:
3762e06152
Fix possible out of bounds read
Marco Nelissen [Tue, 5 Jun 2018 21:39:01 +0000 (21:39 +0000)]
Merge changes from topic "am-
92cbb3f7-167f-4f57-b682-
f916686fead9-mnc-dev" into nyc-dr1-dev
* changes:
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5 am:
bad0533d2e
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86
[automerger] Fix possible out of bounds read am:
3762e06152
Fix possible out of bounds read
Marco Nelissen [Tue, 5 Jun 2018 21:39:01 +0000 (21:39 +0000)]
Merge changes from topic "am-
92cbb3f7-167f-4f57-b682-
f916686fead9-mnc-dev" into nyc-dev
* changes:
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86
[automerger] Fix possible out of bounds read am:
3762e06152
Fix possible out of bounds read
Marco Nelissen [Tue, 5 Jun 2018 21:39:01 +0000 (21:39 +0000)]
Merge changes from topic "am-
92cbb3f7-167f-4f57-b682-
f916686fead9-mnc-dev" into mnc-dr1.5-dev
* changes:
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86
[automerger] Fix possible out of bounds read am:
3762e06152
Fix possible out of bounds read
Marco Nelissen [Tue, 5 Jun 2018 21:39:01 +0000 (21:39 +0000)]
Merge changes from topic "am-
92cbb3f7-167f-4f57-b682-
f916686fead9-mnc-dev" into cw-e-dev
* changes:
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86
[automerger] Fix possible out of bounds read am:
3762e06152
Fix possible out of bounds read
Marco Nelissen [Tue, 5 Jun 2018 21:39:01 +0000 (21:39 +0000)]
Merge changes from topic "am-
92cbb3f7-167f-4f57-b682-
f916686fead9-mnc-dev" into mnc-dr-dev
* changes:
[automerger] Fix possible out of bounds read am:
3762e06152
Fix possible out of bounds read
Marco Nelissen [Tue, 5 Jun 2018 21:39:01 +0000 (21:39 +0000)]
Merge "Fix possible out of bounds read" into mnc-dev
Robert Shih [Tue, 5 Jun 2018 21:38:08 +0000 (14:38 -0700)]
[automerger] M3UParser: make url on demand am:
26e236bd42 am:
042483b6ad am:
9500a5c893 am:
6fac86e8f4 am:
cc3897e95b am:
a333901a90 am:
b5029cb717 am:
e143e026ce am:
5673ef3ece
am:
29efa36532
Change-Id: I64541739bfbd2ce67a3e464fbd75e078dcb157cc
TreeHugger Robot [Tue, 5 Jun 2018 20:59:26 +0000 (20:59 +0000)]
Merge "OMXNodeInstance: Allow dynamic native handle mode for input buffers" into oc-dev
Sanjay Singh [Wed, 23 May 2018 11:35:13 +0000 (17:05 +0530)]
OMXNodeInstance: Allow dynamic native handle mode for input buffers
Some camera implementation uses Dynamic native handle to send input
buffers to OMX HAL. Therefore, these buffers should be allowed.
Bug:
77486542
Bug:
80174666
Bug:
80210572
Bug:
80252747
Test: sts-tradefed run sts -m StsHostTestCases -t android.security.sts.Poc18_06#testPocBug_77486542
Test: adb shell am instrument -e size small -w 'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Test: adb shell am instrument -e class android.hardware.cts.CameraTest -w 'android.camera.cts/android.support.test.runner.AndroidJUnitRunner'
Test: adb shell am instrument -e class android.hardware.multiprocess.camera.cts.CameraEvictionTest -w 'android.camera.cts/android.support.test.runner.AndroidJUnitRunner'
Test: Exercise secure playback with Play Movies app.
Test: Record video with Camera app and play it back with Photos app
Change-Id: I1e4eb72e070f4e60ff4df94f9b9d161361828477
Android Build Merger (Role) [Tue, 5 Jun 2018 01:55:02 +0000 (01:55 +0000)]
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5 am:
bad0533d2e am:
19d1113bb0 am:
8aeab2cad9 am:
b04ca4cb26 am:
9cae8be448
Change-Id: Iec58a99cd012bafb4fe1665abfc90337ae0e74c0
Android Build Merger (Role) [Tue, 5 Jun 2018 01:55:00 +0000 (01:55 +0000)]
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5 am:
bad0533d2e am:
19d1113bb0 am:
8aeab2cad9 am:
b04ca4cb26
Change-Id: I8e019cb7e9bff94970082b3a3329ff0b33c37135
Android Build Merger (Role) [Tue, 5 Jun 2018 01:54:58 +0000 (01:54 +0000)]
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5 am:
bad0533d2e am:
19d1113bb0 am:
8aeab2cad9
Change-Id: I783c7188d71b1f0bd36320a94fcbd9a9e7e39228
Android Build Merger (Role) [Tue, 5 Jun 2018 01:54:56 +0000 (01:54 +0000)]
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5 am:
bad0533d2e am:
19d1113bb0
Change-Id: Ief894a707f37e18052c5deb54500aa499f69340c
Android Build Merger (Role) [Tue, 5 Jun 2018 01:54:55 +0000 (01:54 +0000)]
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5 am:
bad0533d2e
Change-Id: Ia5a88da9a0fb034270bacc91b2079e56faecc100
Android Build Merger (Role) [Tue, 5 Jun 2018 01:54:52 +0000 (01:54 +0000)]
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42 am:
4cdd5c3af5
Change-Id: I377cba24b9723397499a1077df22ff018031344f
Android Build Merger (Role) [Tue, 5 Jun 2018 01:54:50 +0000 (01:54 +0000)]
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86 am:
1c7bb87a42
Change-Id: I67887296e09db454c57a3e5026eb7c5d14295084
Android Build Merger (Role) [Tue, 5 Jun 2018 01:54:49 +0000 (01:54 +0000)]
[automerger] Fix possible out of bounds read am:
3762e06152 am:
ecc92a1a86
Change-Id: I212c02b69b7d9aa773a8ed1a013a3ff3dd643612
Android Build Merger (Role) [Tue, 5 Jun 2018 01:54:47 +0000 (01:54 +0000)]
[automerger] Fix possible out of bounds read am:
3762e06152
Change-Id: I8bfce5324c52c2203a8f4d3a88ee8c1734114992
Marco Nelissen [Fri, 1 Jun 2018 17:48:25 +0000 (10:48 -0700)]
Fix possible out of bounds read
Bug:
78656554
Test: manual
Change-Id: I677f827483dcc80afac57fd7ef6807e633542252
Android Build Merger (Role) [Fri, 1 Jun 2018 23:36:16 +0000 (23:36 +0000)]
[automerger] M3UParser: make url on demand am:
26e236bd42 am:
042483b6ad am:
9500a5c893 am:
6fac86e8f4 am:
cc3897e95b am:
a333901a90 am:
b5029cb717 am:
e143e026ce am:
5673ef3ece
Change-Id: I7c53c7c283690aa24545cd7ee25761df5196d39e
OSDN Git Service
