filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
216 Commits 1 Branch 0 Tags
37f70d2951be756c7348dfb5b13f7675dec9399b
Commit Graph
216 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Duffin 37f70d2951 Fix dependencies of packages that target earlier releases 
am: 7b2c6ed6a5

Change-Id: I82c88cdf42903770c7cbbc23e3f0b0394c833089
 2017-06-14 14:36:55 +00:00
Paul Duffin 7b2c6ed6a5 Fix dependencies of packages that target earlier releases 
A previous change added legacy-android-test as a static dependency to
all packages that build against the current, test_current or
system_current and failed to compile when the junit and android.test
classes were removed from the API. Unfortunately, those changes did not
take into account that some of those packages target earlier API
versions and so will always have the classes available at runtime.

This change replaces those static dependencies with dynamic dependencies
for any package that targets an earlier API version. The file changes
were made automatically by a tool that constructed and then analyzed a
full dependency graph of all the Android Java modules. The individual
changes were checked manually to ensure that the changes matched the
intent. The affected modules were built against an API with the junit
and android.test classes removed. Any issues found during this process
resulted in either the tool being updated to address the issue or a
separate change being made to fix an existing problem with the build. A
sample of the affected packages were run to ensure that they worked as
expected at runtime; no issues were found during testing.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* tests/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because messagingtests's manifest file (AndroidManifest.xml)
    targets API level 19 and dynamically includes the
    android.test.runner library at runtime so there is no point in
    statically including the classes.

    Added 'android.test.mock.sdk' and 'legacy-android-test' to
    LOCAL_JAVA_LIBRARIES because module messagingtests builds against
    'LOCAL_SDK_VERSION := current' and uses classes from packages
    android.test and android.test.mock (possibly indirectly) so will no
    longer compile once they are removed from the API.

    Dependency 'android.test.mock.sdk' is used instead of
    'android.test.mock' because module messagingtests builds against
    the API not internal jars and so should use libraries that build
    against the API not internal jars.

    A future change will replace the dependency on
    'legacy-android-test', which builds against the internal jars with
    a dependency on 'android.legacy.test' which will build against the
    API.

Bug: 30188076
Test: make checkbuild and ran a sample of tests
Change-Id: I3421d13eb6847647cae6982ecf704af769c83500
 2017-06-13 12:28:59 +01:00
Sanket Padawe efad207abc Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'. 
am: 56eaeedbb4

Change-Id: I6ff74db8a3bcc83768418293a4410e1b05daa732
 2017-03-23 00:45:48 +00:00
Sanket Padawe 56eaeedbb4 Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'. 
Bug: 35767068
Test: No build failure on update.
Change-Id: Iab619e80da63685212043f88d30c171a013f8925
Merged-in: Iab619e80da63685212043f88d30c171a013f8925
 2017-03-21 22:32:23 +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 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