Commit Graph
273 Commits
Author SHA1 Message Date
Matt Sarett 09f7cfd826 Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 am: 172aeda52b am: d7b191a016 am: ffa6f9ac89 am: ebe4ce865f
am: 06dbece4c5  -s ours

Change-Id: I61df8ade67a8b9ef527a89f695c1b4ee27f8303f
2017-03-15 17:19:34 +00:00
Matt Sarett 06dbece4c5 Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 am: 172aeda52b am: d7b191a016 am: ffa6f9ac89
am: ebe4ce865f

Change-Id: I33a345152cc1c2eebc1ac7be4ee8c9649f4794a1
2017-03-15 17:14:33 +00:00
Matt Sarett ebe4ce865f Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 am: 172aeda52b am: d7b191a016
am: ffa6f9ac89

Change-Id: Ib6053a2965920cb2487f1d697ba51d26a275eea4
2017-03-15 17:10:03 +00:00
Matt Sarett ffa6f9ac89 Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 am: 172aeda52b
am: d7b191a016

Change-Id: I1637b3f32e85d91c16d64ccfcb7227fb55b8dbd7
2017-03-15 17:05:02 +00:00
Matt Sarett d7b191a016 Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5
am: 172aeda52b

Change-Id: I0b3f11dfc15470583a2890ed54406d96dd0cbfe9
2017-03-15 16:59:32 +00:00
Matt Sarett 172aeda52b Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours
am: 7fb08c55f5

Change-Id: I3b3a5e591427010eb9814bc8bbf49ff472024b61
2017-03-15 16:54:02 +00:00
Matt Sarett 7fb08c55f5 Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314
am: cc1dbfc497  -s ours

Change-Id: I15259006a672182c3d5abab0172eb51d94e64c2b
2017-03-15 16:49:25 +00:00
Matt Sarett cc1dbfc497 Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec
am: 93facf6314

Change-Id: Ib851a4d150690cc4959455dc0f7bc249fbd784c6
2017-03-15 16:45:22 +00:00
Matt Sarett 93facf6314 Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e
am: 0cf3a7d3ec

Change-Id: I17c2d833878a9e60efc9b65eb5c8d91299d5ea42
2017-03-15 16:39:46 +00:00
Matt Sarett 0cf3a7d3ec Update callers *GifCloseFile for new GIFLIB DO NOT MERGE
am: 60519c717e

Change-Id: I6f3b4664585a35d3177aea9371e283d567044e6e
2017-03-15 16:34:47 +00:00
Matt Sarett 60519c717e Update callers *GifCloseFile for new GIFLIB DO NOT MERGE
Bug:34697653
Test: build; existing CTS tests

Original commit message:
Fix build breakage caused by updating giflib

Change-Id: I085379470620ec4db13f8baf7a9eb069747270b7
2017-03-15 10:15:32 -04:00
Paul Duffin ee40b6007d Refactor code incompatible with Mockito 2.7.13 am: d529415c68 am: 65a7c6845d
am: 0188c2ac3e

Change-Id: Ie8464f8b26188b12837d3eaead36eb94bf150a64
2017-03-10 00:08:31 +00:00
Paul Duffin 0188c2ac3e Refactor code incompatible with Mockito 2.7.13 am: d529415c68
am: 65a7c6845d

Change-Id: Ic09f2a1f08441c9e44612b2f2a63902f7e12764c
2017-03-09 23:59:31 +00:00
Paul Duffin 65a7c6845d Refactor code incompatible with Mockito 2.7.13
am: d529415c68

Change-Id: I9c5f55ea1e7b9224033435159b19ef81fa9832e3
2017-03-09 23:56:06 +00:00
Paul Duffin d529415c68 Refactor code incompatible with Mockito 2.7.13
Bug: 32912773
Test: make checkbuild
Change-Id: I252a7e8ae8473f0ce7e177f691aac7dfeb67e7d8
2017-03-09 18:49:41 +00:00
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 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 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 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