OSDN Git Service
Lajos Molnar [Fri, 9 Sep 2016 17:14:35 +0000 (17:14 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev am:
6981afc6ac -s ours am:
efd392db1d am:
d4b1c832c9 am:
0748e8945e -s ours am:
0676b43165 am:
109a42f811
am:
809027b0bf
Change-Id: Ib43360bc65aba8fc34967f665386a6ad3b6e4160
Lajos Molnar [Fri, 9 Sep 2016 17:14:34 +0000 (17:14 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing am:
86369364a0 -s ours am:
97f82679d8 am:
2815b127e0 am:
8eca7511cc -s ours am:
6d54c422cf am:
fc936d5a6e
am:
0e134eae28
Change-Id: I9d6ec175abbc74168d8cebb2822f3f440ef48be1
Lajos Molnar [Fri, 9 Sep 2016 17:14:33 +0000 (17:14 +0000)]
Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev am:
7c36c95b19 am:
4e3aea6a85 am:
4390796eeb am:
511cbadc98 am:
b5ae909c74
am:
890ef9f40f
Change-Id: I1604a238ea51deeb2bad74368ea65d2322e4ee8f
Lajos Molnar [Fri, 9 Sep 2016 17:14:26 +0000 (17:14 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing am:
9a4768f7bf am:
da3cba194b am:
61bb7a0d99 -s ours am:
75dd199ec4 am:
7e12739f4b
am:
c06be67278
Change-Id: Ie2f8b1352ab8834afcc92e38114a4e72479b9512
Wonsik Kim [Fri, 9 Sep 2016 17:14:19 +0000 (17:14 +0000)]
DO NOT MERGE omx: check buffer port before using am:
0e2cc67785 am:
5dd07a6ef3 am:
beb7008c2e -s ours am:
9e7442d243 am:
5ab9958989
am:
e57fe76dac
Change-Id: I95aaa3f59f1382a68f89326ab012c850a36770a0
Lajos Molnar [Fri, 9 Sep 2016 17:11:35 +0000 (17:11 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev am:
6981afc6ac -s ours am:
efd392db1d am:
d4b1c832c9 am:
0748e8945e -s ours am:
0676b43165
am:
109a42f811
Change-Id: I622978a0a22d3e4b416c5a5dccbdb15c753b6562
Lajos Molnar [Fri, 9 Sep 2016 17:11:34 +0000 (17:11 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing am:
86369364a0 -s ours am:
97f82679d8 am:
2815b127e0 am:
8eca7511cc -s ours am:
6d54c422cf
am:
fc936d5a6e
Change-Id: Ibf0809749f082b1fa886e52495296d853fcc1fd6
Lajos Molnar [Fri, 9 Sep 2016 17:11:33 +0000 (17:11 +0000)]
Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev am:
7c36c95b19 am:
4e3aea6a85 am:
4390796eeb am:
511cbadc98
am:
b5ae909c74
Change-Id: I2a34e07a5e122991d00d28163ed606ef89839eed
Lajos Molnar [Fri, 9 Sep 2016 17:11:26 +0000 (17:11 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing am:
9a4768f7bf am:
da3cba194b am:
61bb7a0d99 -s ours am:
75dd199ec4
am:
7e12739f4b
Change-Id: I46e0c6c69b333868e8f072595c25dd74d2165cc6
Wonsik Kim [Fri, 9 Sep 2016 17:11:19 +0000 (17:11 +0000)]
DO NOT MERGE omx: check buffer port before using am:
0e2cc67785 am:
5dd07a6ef3 am:
beb7008c2e -s ours am:
9e7442d243
am:
5ab9958989
Change-Id: I36b528ece7fe9bfeb76fd87082b307251c01c3fb
Lajos Molnar [Fri, 9 Sep 2016 17:08:35 +0000 (17:08 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev am:
6981afc6ac -s ours am:
efd392db1d am:
d4b1c832c9 am:
0748e8945e -s ours
am:
0676b43165
Change-Id: I27d0a6c9f4129210c676002e553f50bdf07a8c8c
Lajos Molnar [Fri, 9 Sep 2016 17:08:34 +0000 (17:08 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing am:
86369364a0 -s ours am:
97f82679d8 am:
2815b127e0 am:
8eca7511cc -s ours
am:
6d54c422cf
Change-Id: Id25b91f92922eb61d2f6c617352940c91a86c3d0
Lajos Molnar [Fri, 9 Sep 2016 17:08:33 +0000 (17:08 +0000)]
Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev am:
7c36c95b19 am:
4e3aea6a85 am:
4390796eeb
am:
511cbadc98
Change-Id: Ibb7e88f5ff4408656485c59562e8b9181b28c3bb
Lajos Molnar [Fri, 9 Sep 2016 17:08:26 +0000 (17:08 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing am:
9a4768f7bf am:
da3cba194b am:
61bb7a0d99 -s ours
am:
75dd199ec4
Change-Id: I80ecfe900bfee031baf26a89cedf15938673056b
Wonsik Kim [Fri, 9 Sep 2016 17:08:19 +0000 (17:08 +0000)]
DO NOT MERGE omx: check buffer port before using am:
0e2cc67785 am:
5dd07a6ef3 am:
beb7008c2e -s ours
am:
9e7442d243
Change-Id: Ib6b7742e8a57e9ba1e1d7e0e0215fa292d2b5a28
Lajos Molnar [Fri, 9 Sep 2016 17:05:33 +0000 (17:05 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev am:
6981afc6ac -s ours am:
efd392db1d am:
d4b1c832c9
am:
0748e8945e -s ours
Change-Id: Ief4bd9419931bd2a1158445d110b313c8a777af7
Lajos Molnar [Fri, 9 Sep 2016 17:05:32 +0000 (17:05 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing am:
86369364a0 -s ours am:
97f82679d8 am:
2815b127e0
am:
8eca7511cc -s ours
Change-Id: I0f5df98f733c64d4e4ab6761c0f85574561aafd2
Lajos Molnar [Fri, 9 Sep 2016 17:05:30 +0000 (17:05 +0000)]
Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev am:
7c36c95b19 am:
4e3aea6a85
am:
4390796eeb
Change-Id: If65018427bcdce6e6faec5c42f53d1ae9e99cc28
Lajos Molnar [Fri, 9 Sep 2016 17:05:24 +0000 (17:05 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing am:
9a4768f7bf am:
da3cba194b
am:
61bb7a0d99 -s ours
Change-Id: I3174f611aade730cbb2cbf9f4daaa01b5f665fc3
Wonsik Kim [Fri, 9 Sep 2016 17:05:18 +0000 (17:05 +0000)]
DO NOT MERGE omx: check buffer port before using am:
0e2cc67785 am:
5dd07a6ef3
am:
beb7008c2e -s ours
Change-Id: Ie44e05eea9e40d81de9f615422ced307282c9868
Lajos Molnar [Fri, 9 Sep 2016 17:02:18 +0000 (17:02 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev am:
6981afc6ac -s ours am:
efd392db1d
am:
d4b1c832c9
Change-Id: I3a58ea5c113f24ca9d86a0d49d9bddff30be6a5c
Lajos Molnar [Fri, 9 Sep 2016 17:02:17 +0000 (17:02 +0000)]
Merge "IOMX: work against metadata buffer spoofing" into mnc-dev am:
030fbd4835 am:
cf5daab31d
am:
9fd711e4b2
Change-Id: Ib4c9a8c93b6a45738dc0b717b69e663beb34f0bc
Lajos Molnar [Fri, 9 Sep 2016 17:02:16 +0000 (17:02 +0000)]
IOMX: work against metadata buffer spoofing am:
f8a4cb4101 am:
8751b3c3ac
am:
b2fcb2c5b0
Change-Id: I1d1ae07b089a5bb83c99d669ab74df5be75ebb1a
Lajos Molnar [Fri, 9 Sep 2016 17:00:57 +0000 (17:00 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing am:
86369364a0 -s ours am:
97f82679d8
am:
2815b127e0
Change-Id: I3a5e9d6c41982e0e0a8f8ca50202c6c45a92cf45
Lajos Molnar [Fri, 9 Sep 2016 17:00:55 +0000 (17:00 +0000)]
Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev am:
7c36c95b19
am:
4e3aea6a85
Change-Id: Icae83108c9c067b5926178ef0e0150a287ac7d33
Lajos Molnar [Fri, 9 Sep 2016 17:00:44 +0000 (17:00 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing am:
9a4768f7bf
am:
da3cba194b
Change-Id: I018340e57d237e4d36d68e2cd118336242447b9c
Wonsik Kim [Fri, 9 Sep 2016 17:00:38 +0000 (17:00 +0000)]
DO NOT MERGE omx: check buffer port before using am:
0e2cc67785
am:
5dd07a6ef3
Change-Id: I3b95ef380f380dac23aaf97be96630ca8bef552c
Lajos Molnar [Fri, 9 Sep 2016 17:00:32 +0000 (17:00 +0000)]
Merge "IOMX: work against metadata buffer spoofing" into mnc-dev am:
030fbd4835
am:
cf5daab31d
Change-Id: I12c9ba2b8bafc2b42dd58f888c397ae5ec3f34cb
Lajos Molnar [Fri, 9 Sep 2016 17:00:32 +0000 (17:00 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev am:
6981afc6ac -s ours
am:
efd392db1d
Change-Id: I8281b233acd6ff226964b7d8b9a5702cf74d18cd
Lajos Molnar [Fri, 9 Sep 2016 16:59:47 +0000 (16:59 +0000)]
IOMX: work against metadata buffer spoofing am:
f8a4cb4101
am:
8751b3c3ac
Change-Id: Ic91387f22a93cecf891706db0f50c8ab5de31a3a
Lajos Molnar [Fri, 9 Sep 2016 16:59:45 +0000 (16:59 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing am:
86369364a0 -s ours
am:
97f82679d8
Change-Id: I135260d20085f49a9dd3dafd83d76e4408a8f33e
Lajos Molnar [Fri, 9 Sep 2016 16:56:46 +0000 (16:56 +0000)]
Merge "IOMX: work against metadata buffer spoofing" into mnc-dev
am:
030fbd4835
Change-Id: I33bd8e92b0520adadce325ce8bbf40dcb74b44fc
Lajos Molnar [Fri, 9 Sep 2016 16:56:46 +0000 (16:56 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev
am:
6981afc6ac -s ours
Change-Id: I1987358c9b524bc1bd3863f0653947ba7d09407e
Lajos Molnar [Fri, 9 Sep 2016 16:56:46 +0000 (16:56 +0000)]
IOMX: work against metadata buffer spoofing
am:
f8a4cb4101
Change-Id: I3aeec794c96fe3b0000546700e010b5ddc6e4f0f
Lajos Molnar [Fri, 9 Sep 2016 16:56:46 +0000 (16:56 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing
am:
86369364a0 -s ours
Change-Id: Ic53907aae24e4238e64a269cd957a0947cc18491
Lajos Molnar [Fri, 9 Sep 2016 16:54:43 +0000 (16:54 +0000)]
Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev
am:
7c36c95b19
Change-Id: I6b2c80df71e7b131ada618141db3cdec37d9e587
Lajos Molnar [Fri, 9 Sep 2016 16:54:42 +0000 (16:54 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing
am:
9a4768f7bf
Change-Id: Ib611c8e1abdff62df4f8067c1bb7a5e2dd18c328
Wonsik Kim [Fri, 9 Sep 2016 16:54:37 +0000 (16:54 +0000)]
DO NOT MERGE omx: check buffer port before using
am:
0e2cc67785
Change-Id: Ie5692f86d9cbb0b2c890517b6f5f1b0db1e7c281
Lajos Molnar [Fri, 9 Sep 2016 16:52:15 +0000 (16:52 +0000)]
Merge "IOMX: work against metadata buffer spoofing" into mnc-dev
Lajos Molnar [Fri, 9 Sep 2016 16:51:52 +0000 (16:51 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev
Lajos Molnar [Fri, 9 Sep 2016 16:51:06 +0000 (16:51 +0000)]
Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev
* changes:
DO NOT MERGE: IOMX: work against metadata buffer spoofing
DO NOT MERGE omx: check buffer port before using
Jeff Tinker [Wed, 7 Sep 2016 19:06:22 +0000 (19:06 +0000)]
Fix stack content leak vulnerability in mediaserver am:
9a6861cbd3 am:
647f55d75d
am:
b6d08633e9
Change-Id: I22847c315e8541e9a5c4ea9c2c23a0050b6312c5
Jeff Tinker [Wed, 7 Sep 2016 19:03:47 +0000 (19:03 +0000)]
Fix stack content leak vulnerability in mediaserver am:
9a6861cbd3
am:
647f55d75d
Change-Id: I837716c9faecb5750443c59ac01ae7cb0f8172ea
Jeff Tinker [Wed, 7 Sep 2016 19:01:22 +0000 (19:01 +0000)]
Fix stack content leak vulnerability in mediaserver
am:
9a6861cbd3
Change-Id: I3c8d56b18678f68ff4617620312c4c32d4e0baf7
Jeff Tinker [Fri, 2 Sep 2016 18:36:46 +0000 (11:36 -0700)]
Fix stack content leak vulnerability in mediaserver
bug:
30875060
Change-Id: I03f4d08b7b31ac5b507cfc9e65e5607c73972d95
Wei Jia [Wed, 31 Aug 2016 00:28:27 +0000 (00:28 +0000)]
MediaPlayerService: allow next player to be NULL am:
2828412787 am:
f4e00a7c5a am:
0dd714e408 am:
de97dbd662 am:
a7549d3dce am:
c6fdb3d696 am:
629e78c10f am:
50b9d889e6 am:
81e0557519
am:
31407677bc
Change-Id: I0dba90208e5a8f316658e3521544445fa00614cc
Wei Jia [Wed, 31 Aug 2016 00:25:57 +0000 (00:25 +0000)]
MediaPlayerService: allow next player to be NULL am:
2828412787 am:
f4e00a7c5a am:
0dd714e408 am:
de97dbd662 am:
a7549d3dce am:
c6fdb3d696 am:
629e78c10f am:
50b9d889e6
am:
81e0557519
Change-Id: Id17354d41c8f3c4e41d03eb9467ca7d482b522df
Wei Jia [Wed, 31 Aug 2016 00:22:57 +0000 (00:22 +0000)]
MediaPlayerService: allow next player to be NULL am:
2828412787 am:
f4e00a7c5a am:
0dd714e408 am:
de97dbd662 am:
a7549d3dce am:
c6fdb3d696 am:
629e78c10f
am:
50b9d889e6
Change-Id: I86b58e0cb64d668021a649627e34a0386dcc619a
Wei Jia [Wed, 31 Aug 2016 00:19:57 +0000 (00:19 +0000)]
MediaPlayerService: allow next player to be NULL am:
2828412787 am:
f4e00a7c5a am:
0dd714e408 am:
de97dbd662 am:
a7549d3dce am:
c6fdb3d696
am:
629e78c10f
Change-Id: I14c17d063743ca79f43f674c2d4cbcb57f90451e
Wei Jia [Wed, 31 Aug 2016 00:16:56 +0000 (00:16 +0000)]
MediaPlayerService: allow next player to be NULL am:
2828412787 am:
f4e00a7c5a am:
0dd714e408 am:
de97dbd662 am:
a7549d3dce
am:
c6fdb3d696
Change-Id: I6e1cb16e9c281bda0375f552aab01b2ee069c14b
Wei Jia [Wed, 31 Aug 2016 00:13:56 +0000 (00:13 +0000)]
MediaPlayerService: allow next player to be NULL am:
2828412787 am:
f4e00a7c5a am:
0dd714e408 am:
de97dbd662
am:
a7549d3dce
Change-Id: I56c379ef39b1fd80493798de79a61db140646c50
Wei Jia [Wed, 31 Aug 2016 00:10:56 +0000 (00:10 +0000)]
MediaPlayerService: allow next player to be NULL am:
2828412787 am:
f4e00a7c5a am:
0dd714e408
am:
de97dbd662
Change-Id: I758cf33ec36858a612efe6c412af3df9653f9229
Wei Jia [Wed, 31 Aug 2016 00:08:25 +0000 (00:08 +0000)]
MediaPlayerService: allow next player to be NULL am:
2828412787 am:
f4e00a7c5a
am:
0dd714e408
Change-Id: Ib620e8573ff6da861c101311143d266fd5086d7b
Wei Jia [Wed, 31 Aug 2016 00:05:25 +0000 (00:05 +0000)]
MediaPlayerService: allow next player to be NULL am:
2828412787
am:
f4e00a7c5a
Change-Id: I4b72afd20bbca69423d1be6ebf963ed41ded1a4e
Wei Jia [Wed, 31 Aug 2016 00:02:55 +0000 (00:02 +0000)]
MediaPlayerService: allow next player to be NULL
am:
2828412787
Change-Id: I54fad659721dde258259a503c5514d6327e521f7
Wei Jia [Tue, 30 Aug 2016 20:49:06 +0000 (13:49 -0700)]
MediaPlayerService: allow next player to be NULL
Bug:
31155917
Bug:
30204103
Change-Id: I9a2a59ddb900fc942e7c19b31b53a110d790474c
Robert Shih [Mon, 22 Aug 2016 19:05:53 +0000 (19:05 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am:
4fb531e262 am:
24b2dba452 am:
7fa7052231 -s ours am:
91ec9a6fd3 -s ours am:
a9c1e43d89 am:
82bc8c4511 am:
6f8e939c58 -s ours am:
f49ac6ef61 am:
5d7ca78437
am:
3662106826
Change-Id: I4b0b972deecd8806f13531a20a6740d2b8c5db6c
Robert Shih [Mon, 22 Aug 2016 19:05:52 +0000 (19:05 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast am:
c159a5ae12 am:
2cee1deec9 am:
48b3aca54b -s ours am:
08eab78209 -s ours am:
081388d875 am:
d6e7dcbb64 am:
47932efd3d -s ours am:
b83d53d49a am:
015c71c8fd
am:
4748e19a97
Change-Id: Id5de00609ad4a924d56bc8b904ce6ec602256a9b
Robert Shih [Mon, 22 Aug 2016 19:01:55 +0000 (19:01 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am:
4fb531e262 am:
24b2dba452 am:
7fa7052231 -s ours am:
91ec9a6fd3 -s ours am:
a9c1e43d89 am:
82bc8c4511 am:
6f8e939c58 -s ours am:
f49ac6ef61
am:
5d7ca78437
Change-Id: I92413bf62f91448e87ae56cd1ad58fd9bfc9e989
Robert Shih [Mon, 22 Aug 2016 19:01:55 +0000 (19:01 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast am:
c159a5ae12 am:
2cee1deec9 am:
48b3aca54b -s ours am:
08eab78209 -s ours am:
081388d875 am:
d6e7dcbb64 am:
47932efd3d -s ours am:
b83d53d49a
am:
015c71c8fd
Change-Id: I2723599e94a89b2d95b1a39ad6e0d7175a16a104
Robert Shih [Mon, 22 Aug 2016 18:56:52 +0000 (18:56 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am:
4fb531e262 am:
24b2dba452 am:
7fa7052231 -s ours am:
91ec9a6fd3 -s ours am:
a9c1e43d89 am:
82bc8c4511 am:
6f8e939c58 -s ours
am:
f49ac6ef61
Change-Id: Ia5850378f26dc69b9114ddff2f342d0b3cebfce6
Robert Shih [Mon, 22 Aug 2016 18:56:52 +0000 (18:56 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast am:
c159a5ae12 am:
2cee1deec9 am:
48b3aca54b -s ours am:
08eab78209 -s ours am:
081388d875 am:
d6e7dcbb64 am:
47932efd3d -s ours
am:
b83d53d49a
Change-Id: I104f430d0bf1897e59bffdfe2bc3e13a9b058a1c
Robert Shih [Mon, 22 Aug 2016 18:48:21 +0000 (18:48 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am:
4fb531e262 am:
24b2dba452 am:
7fa7052231 -s ours am:
91ec9a6fd3 -s ours am:
a9c1e43d89 am:
82bc8c4511
am:
6f8e939c58 -s ours
Change-Id: I5373a4e935db09eb7a98f55cb5266f475b3dcd01
Robert Shih [Mon, 22 Aug 2016 18:48:20 +0000 (18:48 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast am:
c159a5ae12 am:
2cee1deec9 am:
48b3aca54b -s ours am:
08eab78209 -s ours am:
081388d875 am:
d6e7dcbb64
am:
47932efd3d -s ours
Change-Id: Ibe7817e304f96d5f0e6fd00632c3d41833d65c14
Robert Shih [Mon, 22 Aug 2016 18:45:13 +0000 (18:45 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am:
4fb531e262 am:
24b2dba452 am:
7fa7052231 -s ours am:
91ec9a6fd3 -s ours am:
a9c1e43d89
am:
82bc8c4511
Change-Id: I3765b00a451793307c9d23431f8b354bbe71b7df
Robert Shih [Mon, 22 Aug 2016 18:45:12 +0000 (18:45 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast am:
c159a5ae12 am:
2cee1deec9 am:
48b3aca54b -s ours am:
08eab78209 -s ours am:
081388d875
am:
d6e7dcbb64
Change-Id: Id774e978b50314baf0511ea3271ae98039f6ad7f
Robert Shih [Mon, 22 Aug 2016 18:44:20 +0000 (18:44 +0000)]
Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev am:
e35213de2d am:
21cc1102b4 am:
e13b8f2d61 am:
730c25e0dc am:
6a93a9e982 am:
71b72fc26f
am:
21c660a129
Change-Id: I35a947ad41626814622f844f17ad2d3cac5c1ff0
Robert Shih [Mon, 22 Aug 2016 18:44:20 +0000 (18:44 +0000)]
MediaPlayerService: avoid invalid static cast am:
ee0a0e39ac am:
7b6a85546c am:
b07255f603 am:
d560830823 am:
51efd24460 am:
8d32201d4a
am:
2b5ee9c8e4
Change-Id: I303ca3f334c7d6480e7424a0669b5b95197edb85
Robert Shih [Mon, 22 Aug 2016 18:36:26 +0000 (18:36 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am:
4fb531e262 am:
24b2dba452 am:
7fa7052231 -s ours am:
91ec9a6fd3 -s ours
am:
a9c1e43d89
Change-Id: I4d35b92457c636f413ae03a992f71844028dfa90
Robert Shih [Mon, 22 Aug 2016 18:36:25 +0000 (18:36 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast am:
c159a5ae12 am:
2cee1deec9 am:
48b3aca54b -s ours am:
08eab78209 -s ours
am:
081388d875
Change-Id: I685261698d0ecb4e77b5e78aab83b2b38b6a91fb
Robert Shih [Mon, 22 Aug 2016 18:36:19 +0000 (18:36 +0000)]
Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev am:
e35213de2d am:
21cc1102b4 am:
e13b8f2d61 am:
730c25e0dc am:
6a93a9e982
am:
71b72fc26f
Change-Id: If054e86cc711e7af545aff4da48af9fd59cd2b70
Robert Shih [Mon, 22 Aug 2016 18:36:19 +0000 (18:36 +0000)]
MediaPlayerService: avoid invalid static cast am:
ee0a0e39ac am:
7b6a85546c am:
b07255f603 am:
d560830823 am:
51efd24460
am:
8d32201d4a
Change-Id: I995c3d8e87f78596c7e3007f2b0a269542adfd42
Robert Shih [Mon, 22 Aug 2016 18:32:20 +0000 (18:32 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am:
4fb531e262 am:
24b2dba452 am:
7fa7052231 -s ours
am:
91ec9a6fd3 -s ours
Change-Id: I075a2bf350184ade7a96cb1e4846d9459695a630
Robert Shih [Mon, 22 Aug 2016 18:32:20 +0000 (18:32 +0000)]
Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev am:
e35213de2d am:
21cc1102b4 am:
e13b8f2d61 am:
730c25e0dc
am:
6a93a9e982
Change-Id: I5f0a4039ff49ef3e5afabfce151a04fb58a45ae7
Robert Shih [Mon, 22 Aug 2016 18:32:19 +0000 (18:32 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast am:
c159a5ae12 am:
2cee1deec9 am:
48b3aca54b -s ours
am:
08eab78209 -s ours
Change-Id: I82a67d2a77c6cfa2e903e3ff8080ba4ed734f248
Robert Shih [Mon, 22 Aug 2016 18:32:19 +0000 (18:32 +0000)]
MediaPlayerService: avoid invalid static cast am:
ee0a0e39ac am:
7b6a85546c am:
b07255f603 am:
d560830823
am:
51efd24460
Change-Id: I77f1705ddb125b7eb1c1f6b6e8cb61fb0596d2e2
Robert Shih [Mon, 22 Aug 2016 18:28:19 +0000 (18:28 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am:
4fb531e262 am:
24b2dba452
am:
7fa7052231 -s ours
Change-Id: I5dddb4aeffa111dfda64e335d7baf7758a1740ee
Robert Shih [Mon, 22 Aug 2016 18:28:19 +0000 (18:28 +0000)]
Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev am:
e35213de2d am:
21cc1102b4 am:
e13b8f2d61
am:
730c25e0dc
Change-Id: I37b4d338807a9a04393345b859ee9d2d5aff89f6
Robert Shih [Mon, 22 Aug 2016 18:28:19 +0000 (18:28 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast am:
c159a5ae12 am:
2cee1deec9
am:
48b3aca54b -s ours
Change-Id: I1f9d2549a454da70e62cf2cc997c045965ecea9a
Robert Shih [Mon, 22 Aug 2016 18:28:19 +0000 (18:28 +0000)]
MediaPlayerService: avoid invalid static cast am:
ee0a0e39ac am:
7b6a85546c am:
b07255f603
am:
d560830823
Change-Id: I77a7c93a2ae554532accb3be47bdee687b99f271
Robert Shih [Mon, 22 Aug 2016 18:23:43 +0000 (18:23 +0000)]
Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev am:
e35213de2d am:
21cc1102b4
am:
e13b8f2d61
Change-Id: I0087c63b5968ab0bb28eee528d9d0564d3fc225e
Robert Shih [Mon, 22 Aug 2016 18:23:42 +0000 (18:23 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am:
4fb531e262
am:
24b2dba452
Change-Id: Ia3933416f651d737beaae34cab4efd35e9e6156d
Robert Shih [Mon, 22 Aug 2016 18:23:41 +0000 (18:23 +0000)]
MediaPlayerService: avoid invalid static cast am:
ee0a0e39ac am:
7b6a85546c
am:
b07255f603
Change-Id: I9e2b7d8166c629fdbc3457d152e2947f16ba7ae3
Robert Shih [Mon, 22 Aug 2016 18:23:40 +0000 (18:23 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast am:
c159a5ae12
am:
2cee1deec9
Change-Id: I0cde33c6f069de9eac4e954e9c6ed6f6968546be
Robert Shih [Mon, 22 Aug 2016 18:17:19 +0000 (18:17 +0000)]
Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev am:
e35213de2d
am:
21cc1102b4
Change-Id: Ifb645a0070300d95e4091969c25ff27d4615b56f
Robert Shih [Mon, 22 Aug 2016 18:17:18 +0000 (18:17 +0000)]
MediaPlayerService: avoid invalid static cast am:
ee0a0e39ac
am:
7b6a85546c
Change-Id: Idacdce87d96ca64f0bfb06b41c65b5a870515b69
Robert Shih [Mon, 22 Aug 2016 18:12:49 +0000 (18:12 +0000)]
Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev
am:
e35213de2d
Change-Id: I8d1446a8927952b6e8a561089764f6b662a2f0e4
Robert Shih [Mon, 22 Aug 2016 18:12:48 +0000 (18:12 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev
am:
4fb531e262
Change-Id: I3cb099c3fdf0c476a92392b185d782e980a463de
Robert Shih [Mon, 22 Aug 2016 18:12:48 +0000 (18:12 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast
am:
c159a5ae12
Change-Id: I3e349cb44073359b9c009100c341864468187f68
Robert Shih [Mon, 22 Aug 2016 18:12:48 +0000 (18:12 +0000)]
MediaPlayerService: avoid invalid static cast
am:
ee0a0e39ac
Change-Id: I2e857a57fe87c5050b1042d27c8e3034df2a462c
Robert Shih [Mon, 22 Aug 2016 17:53:09 +0000 (17:53 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev
Robert Shih [Mon, 22 Aug 2016 17:53:05 +0000 (17:53 +0000)]
Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev
Andy Hung [Fri, 19 Aug 2016 22:03:31 +0000 (22:03 +0000)]
Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev am:
36e11a4c23 am:
d959102420 am:
c3476feccd am:
6b1403777e am:
be78a1c73f am:
3879515987
am:
d4808afb99
Change-Id: I73d372d208dac982dfed251fbf5a1f08ec361170
Eric Laurent [Fri, 19 Aug 2016 22:03:30 +0000 (22:03 +0000)]
soundtrigger: add size check on sound model and recogntion data am:
ef0c915184 am:
82477c0929 am:
6aa5165f7c am:
c4d991b2ae am:
4f1a678f8c am:
31ab14bef7
am:
1e98e388cb
Change-Id: I54bbef6149da860f28edcd1f0fa135218893f82e
Andy Hung [Fri, 19 Aug 2016 22:00:01 +0000 (22:00 +0000)]
Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev am:
36e11a4c23 am:
d959102420 am:
c3476feccd am:
6b1403777e am:
be78a1c73f
am:
3879515987
Change-Id: I47af1626e252babc0bbafe82b65c8b2db72f8a4d
Eric Laurent [Fri, 19 Aug 2016 22:00:00 +0000 (22:00 +0000)]
soundtrigger: add size check on sound model and recogntion data am:
ef0c915184 am:
82477c0929 am:
6aa5165f7c am:
c4d991b2ae am:
4f1a678f8c
am:
31ab14bef7
Change-Id: I70ab85d0764ffbd8b645e4e19c4f34a641a6ffd4
Andy Hung [Fri, 19 Aug 2016 21:56:28 +0000 (21:56 +0000)]
Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev am:
36e11a4c23 am:
d959102420 am:
c3476feccd am:
6b1403777e
am:
be78a1c73f
Change-Id: I3bd43c2b12d9d393878d411869cfc90d0a4694c2
Eric Laurent [Fri, 19 Aug 2016 21:56:27 +0000 (21:56 +0000)]
soundtrigger: add size check on sound model and recogntion data am:
ef0c915184 am:
82477c0929 am:
6aa5165f7c am:
c4d991b2ae
am:
4f1a678f8c
Change-Id: I901589896d3464b9355d8d5efdc07addb23f7e0a
Andy Hung [Fri, 19 Aug 2016 21:52:27 +0000 (21:52 +0000)]
Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev am:
36e11a4c23 am:
d959102420 am:
c3476feccd
am:
6b1403777e
Change-Id: Id56c2493fe3e4b99e2e0333f8eff6fba53f0b24c
Eric Laurent [Fri, 19 Aug 2016 21:52:26 +0000 (21:52 +0000)]
soundtrigger: add size check on sound model and recogntion data am:
ef0c915184 am:
82477c0929 am:
6aa5165f7c
am:
c4d991b2ae
Change-Id: I3aa665734e6aae7ae4e7f8f32578d8d5bd4937d5
OSDN Git Service
