Paul Duffin
3dd54cd669
Prepare for removal of junit and android.test classes from Android API (step 1) am: e98e557469 am: 3fc616a742
...
am: 872137e536
Change-Id: I5a98e76df88ad9524916b5b8757755f58df3e849
2017-03-03 14:47:08 +00:00
Paul Duffin
872137e536
Prepare for removal of junit and android.test classes from Android API (step 1) am: e98e557469
...
am: 3fc616a742
Change-Id: Ib4ed27bf723799aede7d198939c5e22def4af5a5
2017-03-03 14:44:15 +00:00
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
Tom Taylor
e0f37bb8e1
22851197 Messaging Application crash with unsupported type's URI
...
This bug and AOSP patch arrived last July. Supposedly, I
merged the change, but it's certainly not fixed in bugler, nor in various
copies of PduPersister in Android's master. Fixing all the locations
now.
Test: manual - sent/received MMS's to verify the change didn't break
existing behavior.
Bug: 22851197
Change-Id: Ia79bd9951b1820ebc42baf0eef38667753d77ab9
2017-02-23 10:41:40 -08:00
Paul Duffin
5a41083bb4
Use com.android.messaging.util.Assert instead of junit.framework.Assert am: 991c2e5ab8 am: 3cce9e3644
...
am: 613ba55900
Change-Id: I563bd41bf19d58268fa82194c58880a329fbdbc7
2017-02-21 18:20:20 +00:00
Paul Duffin
613ba55900
Use com.android.messaging.util.Assert instead of junit.framework.Assert am: 991c2e5ab8
...
am: 3cce9e3644
Change-Id: Id61aac4365d076ee036fa9845f0b8e10718deff9
2017-02-21 18:10:13 +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
5d2ab59dcd
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
...
am: 103c8bdb63
Change-Id: I693dd05d0ce05117dc249bc6dac412a86800b528
2017-01-17 20:11:26 +00:00
Tom Taylor
8ff9c6abce
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
...
am: 8bace8dbea
Change-Id: I526b39e57f55282c77c74e26f61fd06211303c69
2017-01-17 20:11:18 +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
Roozbeh Pournader
65d0bead73
Rename language+country resources to just language
...
Bug: 26496609
Test: none
Change-Id: I78092318110a6916e07a5213e3584bf04ddd954c
2017-01-10 20:57:09 -08:00
Tom Taylor
6c7fecc71a
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
...
am: c40e95726f
Change-Id: I0c24254c09149ef14159e5d4b819167fd645eff8
2017-01-06 18:17:48 +00:00
Tom Taylor
d46ee4aa4f
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
...
am: 61c16108ac
Change-Id: Ief7241e44856ee070b0c381e3d1baf5eaa3f6137
2017-01-06 18:17:38 +00: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
Tom Taylor
9124acfb8f
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
...
am: aba491e150
Change-Id: Iefe48593ea99b2d73e8ca2500e77f2ccc82b9b36
2016-12-07 03:06:40 +00:00
Tom Taylor
cebf2d2fed
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
...
am: 6866222775
Change-Id: I9257577181cb175e670dbdd319ff3ffa3a239597
2016-12-07 03:06:39 +00:00
Tom Taylor
07ac300933
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
...
am: ab3d4505b8
Change-Id: I72ff3ae7db523a1ea15f14809023d05303c9de0e
2016-12-07 03:06:22 +00:00
Tom Taylor
30c4aa86d7
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
...
am: c1acc768f6
Change-Id: I6dcdf216d98de94cdd72a15c130b89ef38a9b58f
2016-12-07 03:06:21 +00:00
Tom Taylor
959501b7a8
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
...
am: 6f1cbaf08f
Change-Id: I1026fe6d52c9f91dd31701659237f78e65ee41f5
2016-12-07 03:06:05 +00:00
Tom Taylor
611d8f76df
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f am: 713068d06e
...
am: c2faf5d56b
Change-Id: I156be7aede0a1647d73cac3ef79c02c209085969
2016-12-07 03:06:04 +00:00
Tom Taylor
2e21662e13
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f am: 0c37f58fa0
...
am: d918dfbcd7
Change-Id: Ica18f2cbe878d9c7ba111a2678610eeb47a688ac
2016-12-07 03:05:55 +00: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