Paul Duffin
3fc616a742
Prepare for removal of junit and android.test classes from Android API (step 1)
...
am: e98e557469
Change-Id: I9cf742acbfeda8755f8b0c41be0088617d3d3025
2017-03-03 14:41:46 +00:00
Paul Duffin
e98e557469
Prepare for removal of junit and android.test classes from Android API (step 1)
...
In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.
Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.
Bug: 30188076
Test: make checkbuild
Change-Id: Ic5b5b771dbc3cb5a1902cf5eb4e838a2f22c8f87
2017-03-01 13:21:11 +00:00
Paul Duffin
3cce9e3644
Use com.android.messaging.util.Assert instead of junit.framework.Assert
...
am: 991c2e5ab8
Change-Id: Ifb50be13961d566c58c25c3f9f6e7a4ac4b6a260
2017-02-21 18:01:15 +00:00
Paul Duffin
991c2e5ab8
Use com.android.messaging.util.Assert instead of junit.framework.Assert
...
Bug: 35234379
Bug: 30188076
Test: make checkbuild
Change-Id: I3aa9b72393d128877c86c9a116495f76f3e50e18
2017-02-21 11:23:14 +00:00
Tom Taylor
103c8bdb63
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf am: eece1bd759
...
am: 984688e992
Change-Id: I5232bd8c0db4c17084a4c108f2c4aed4f1ceffdd
2017-01-17 20:05:11 +00:00
Tom Taylor
8bace8dbea
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf am: eece1bd759
...
am: 8495e582a1
Change-Id: I92091dcb75ea3289cb875d27bc8fa28c3028c33b
2017-01-17 20:02:06 +00:00
Tom Taylor
984688e992
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf
...
am: eece1bd759
Change-Id: Ib27dbe626b08898bc88063292a8b7750ffa39f9d
2017-01-17 19:59:54 +00:00
Tom Taylor
8495e582a1
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf
...
am: eece1bd759
Change-Id: I5b978323dc12e67a3ea2b27a71d1bf1de27e1c0a
2017-01-17 19:59:54 +00:00
Tom Taylor
eece1bd759
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c
...
am: fb324f89bf
Change-Id: I8e57243cac35d74a28e5af1fd23800d5cb7cb080
2017-01-17 19:57:24 +00:00
Tom Taylor
fb324f89bf
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e
...
am: 657379f51c
Change-Id: I1533f159aa2ae92a6db094722475d2d5f527bb6d
2017-01-17 19:55:43 +00:00
Tom Taylor
657379f51c
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a
...
am: cc649e4e1e
Change-Id: Ibd12cb39d3abb95bacdfd0461927f5bd57b0c2c4
2017-01-17 19:53:24 +00:00
Tom Taylor
cc649e4e1e
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462
...
am: 82fa311e9a
Change-Id: Ifd7c99312f526e379268f5f12a5ff61d95a90996
2017-01-17 19:51:36 +00:00
Tom Taylor
82fa311e9a
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb
...
am: 71d4913462
Change-Id: I114e41f77d0b7e07a2cf404a1d382451f7d6542f
2017-01-17 19:49:23 +00:00
Tom Taylor
71d4913462
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a
...
am: 9f00add2fb
Change-Id: If555818f7f14dcfef35c57c1d3e918ac0f31959a
2017-01-17 19:46:53 +00:00
Tom Taylor
9f00add2fb
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex]
...
am: 6f763fef7a
Change-Id: Ia34564714e00734976099b95594b6ea6501894b9
2017-01-17 19:44:53 +00:00
Tom Taylor
6f763fef7a
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so
...
in colorMap->Colors[colorIndex]
* No range checking was done on a color index. Add range
checking and bail if the color index is out of range.
Test: tested sending a large gif that would invoke the GifTranscoder library
to make the gif smaller.
Bug: 32764144
Change-Id: I44f36274ec333ae1960fa8fc96b2dbde35fbaa66
2017-01-13 14:47:35 -08:00
Tom Taylor
c40e95726f
33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438 am: 728c4943e9 am: 0d9e6a3cf5
...
am: f07dfd0a19
Change-Id: Ib73874d5bd63ab5f43f79de4aff95f107ee00498
2017-01-06 18:12:25 +00:00
Tom Taylor
61c16108ac
33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438 am: 728c4943e9 am: 0d9e6a3cf5
...
am: 2686c894a4
Change-Id: I22c04edf76099b82e2e0d11211a4dfa031d641f1
2017-01-06 18:11:46 +00:00
Tom Taylor
f07dfd0a19
33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438 am: 728c4943e9
...
am: 0d9e6a3cf5
Change-Id: Ib0b070a83020dcddf935e2b1de48cffc5665c986
2017-01-06 18:07:43 +00:00
Tom Taylor
2686c894a4
33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438 am: 728c4943e9
...
am: 0d9e6a3cf5
Change-Id: I39f21154f9c40a4d4f2da0467ad46170a43502e6
2017-01-06 18:07:39 +00:00
Tom Taylor
0d9e6a3cf5
33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438
...
am: 728c4943e9
Change-Id: I9cca57ea1b2e1ab554feec399c6697e14b258a3c
2017-01-06 18:03:43 +00:00
Tom Taylor
728c4943e9
33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529
...
am: 508f541438
Change-Id: I9a59d60847e30a476b187d928cb591cb4b2ac272
2017-01-06 17:59:14 +00:00
Tom Taylor
508f541438
33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35
...
am: 2917015529
Change-Id: I71a178ea92909fe11275ed5a051efca85ec7f6e2
2017-01-06 17:56:08 +00:00
Tom Taylor
2917015529
33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4
...
am: c708e8fb35
Change-Id: Iac2d9f2a4f11f4e0ec70c9aa9aeb8b105729ba7b
2017-01-06 17:51:59 +00:00
Tom Taylor
c708e8fb35
33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779
...
am: cefccea7b4
Change-Id: Ie7926325beb817a1894a4f966a9053e284258330
2017-01-06 17:48:29 +00:00
Tom Taylor
cefccea7b4
33388925 Mismatched new vs delete in framesequence library am: 837474a376
...
am: b44b56b779
Change-Id: I18616dc9fff35bdfef460142dbf1b12a3f625a8e
2017-01-06 17:45:00 +00:00
Tom Taylor
b44b56b779
33388925 Mismatched new vs delete in framesequence library
...
am: 837474a376
Change-Id: I1882a0ea4cb061fe39b2a26c7cd77534a609168c
2017-01-06 17:41:33 +00:00
Tom Taylor
837474a376
33388925 Mismatched new vs delete in framesequence library
...
* The array allocations neglected to include [] so delete, instead
of delete [] would get called.
* Test
Manual
- tested sending a large gif that would invoke the GifTranscoder library
to make the gif smaller.
Bug: 33388925
Change-Id: I1e200e470d66ae615ffe9340ff9c049eaa73f63c
2017-01-04 09:42:37 -08:00
Android Build Merger (Role)
aba491e150
Merge "Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e am: 208a2979d4" into nyc-mr2-dev-plus-aosp
2016-12-07 03:02:09 +00:00
Android Build Merger (Role)
ab3d4505b8
Merge "Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e am: 904b5cbec5" into nyc-mr2-dev-plus-aosp
2016-12-07 03:02:08 +00:00
Tom Taylor
6866222775
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e
...
am: 208a2979d4
Change-Id: I8a09f9dcd0f0fbfe933d55f6764eb831bf8431e7
2016-12-07 03:02:03 +00:00
Tom Taylor
c1acc768f6
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e
...
am: 904b5cbec5
Change-Id: I441e0f4c3f7649796e5d67dc4d14f3a735399be2
2016-12-07 03:02:03 +00:00
Android Build Merger (Role)
6f1cbaf08f
Merge "resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f am: 713068d06e" into nyc-mr2-dev-plus-aosp
2016-12-07 03:02:00 +00:00
Tom Taylor
c2faf5d56b
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f
...
am: 713068d06e
Change-Id: I8a384b612c72a97c7dfa2bf195df8cd8c6858c32
2016-12-07 03:01:55 +00:00
Tom Taylor
d918dfbcd7
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f
...
am: 0c37f58fa0
Change-Id: I3b4cd7a04524f500030941b24edcaf2ecabee70d
2016-12-07 03:01:55 +00:00
Tom Taylor
904b5cbec5
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5
...
am: 4d1366300e
Change-Id: Ieb82c45b1a09c9a8f3cb97ecc7f891971d19f09d
2016-12-07 02:58:04 +00:00
Tom Taylor
208a2979d4
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5
...
am: 4d1366300e
Change-Id: I43080b80b2379787db69156555612fbee3eb0dbf
2016-12-07 02:58:02 +00:00
Tom Taylor
713068d06e
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee
...
am: 838049884f
Change-Id: I301dc30acd2a8647fbc8608f09e41500e6d673dd
2016-12-07 02:57:54 +00:00
Tom Taylor
0c37f58fa0
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee
...
am: 838049884f
Change-Id: I54b2fc3ed0958a928a75575ba111374aa3c5a69c
2016-12-07 02:57:54 +00:00
Tom Taylor
4d1366300e
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03
...
am: 28c5e61eb5
Change-Id: If6822da7a5eb2d5bb59fd6c31d01c47770e07d7d
2016-12-07 02:54:04 +00:00
Tom Taylor
838049884f
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777
...
am: 47feeee8ee
Change-Id: Iec5af613a115c5120bbfd3e99d6e3503d0a05b36
2016-12-07 02:53:54 +00:00
Tom Taylor
28c5e61eb5
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb
...
am: 8166028e03
Change-Id: I2be10933c2b692efd21ad911375232029e5e18fa
2016-12-07 02:49:34 +00:00
Tom Taylor
47feeee8ee
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18
...
am: 4d220d4777
Change-Id: I15daa15adbcd98ac51bdc1d1cf2a344c3638207c
2016-12-07 02:49:24 +00:00
Tom Taylor
8166028e03
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c
...
am: 518c9798eb
Change-Id: I773eb76c12d3c3adf1860cc17c1b09ed56b77e2d
2016-12-07 02:46:00 +00:00
Tom Taylor
4d220d4777
resolve merge conflicts of eafd58a to nyc-dev
...
am: a43c5c5f18
Change-Id: Ibcf2308553a68a8deaa05d15548d3eca67d4579a
2016-12-07 02:45:53 +00:00
Tom Taylor
518c9798eb
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6
...
am: ced2069d1c
Change-Id: I9ddf0377ce1eff5620104cd0a43bb2eba310e469
2016-12-07 02:41:54 +00:00
Tom Taylor
a43c5c5f18
resolve merge conflicts of eafd58a to nyc-dev
...
Change-Id: I58151ca0c248dd4b84c78c8e7ca73d5a80bbd962
2016-12-06 16:26:14 -08:00
Android Build Merger (Role)
756f34d472
Merge "32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7 am: 4dfcff98da am: 615f6d0b17 am: 49b092f602 am: 55ebb66b11" into nyc-mr2-dev-plus-aosp
2016-12-06 22:43:14 +00:00
Tom Taylor
6d7bb21c8a
32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7 am: 4dfcff98da am: 615f6d0b17 am: 49b092f602
...
am: a9bec8503b
Change-Id: Iecfaa9939f7ae7651a8fd8b1ba1a256e0945245c
2016-12-06 22:43:08 +00:00
Tom Taylor
8588963d8a
32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7 am: 4dfcff98da am: 615f6d0b17 am: 49b092f602
...
am: 55ebb66b11
Change-Id: I2bc2a0b5cf516caf7d4458e143eeaab75d9b370a
2016-12-06 22:43:08 +00:00