Commit Graph
317 Commits
Author SHA1 Message Date
Xin Li cd9ba9e128 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Change-Id: Ieafa1d7163c3b586f9daa34a8b8239ea57db6636
2017-11-14 16:38:23 -08:00
Xin Li 8f6c644d6f Merge commit 'b2dd6a8ef54b233843b463204ec4e3b67148a7e8' into HEAD
Change-Id: Id7e29d1428552414abd16ac7cd17d86b51e61658
2017-11-13 14:35:43 -08:00
Chih-Hung Hsieh ea2d2ad395 Use -Werror in packages/apps/Messaging/jni am: cd6efe25a4
am: dfd8a9187f

Change-Id: Ic4f431bbe8c918b7f15f26d06553917e2a8ddfbc
2017-11-02 19:17:18 +00:00
Chih-Hung Hsieh dfd8a9187f Use -Werror in packages/apps/Messaging/jni
am: cd6efe25a4

Change-Id: I56f5bee51ab4a56b11fc4e639b063728735f31e0
2017-11-02 19:03:25 +00:00
Chih-Hung Hsieh cd6efe25a4 Use -Werror in packages/apps/Messaging/jni
Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I3d7f5b98523c9fee08f2d1c29178ae050923617c
2017-11-01 15:56:01 -07:00
Tom Taylor b2dd6a8ef5 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012 am: 3f22a4820c
am: 443a8888f2

Change-Id: I85c47a8571a609321e2c3e0dd4f2a2b57015e839
2017-07-12 19:33:47 +00:00
Tom Taylor 9a643d5c1c 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012 am: 7ace2d5308
am: cb822ae902

Change-Id: I0b28ce9619853b280cd93af783b93d6aff92bc4f
2017-07-12 19:33:39 +00:00
Tom Taylor 443a8888f2 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012
am: 3f22a4820c

Change-Id: I3007cf14803262bbb6f28db602b16252ebc4a62c
2017-07-12 19:29:21 +00:00
Tom Taylor cb822ae902 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012
am: 7ace2d5308

Change-Id: I1872889b944cdffa63bafd7a125315d2fe2d7917
2017-07-12 19:28:15 +00:00
Tom Taylor 7ace2d5308 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f
am: c12af8d012

Change-Id: I70465c2290a2ba08d7647acab20bdfb25e8b3ecd
2017-07-12 19:24:50 +00:00
Tom Taylor 3f22a4820c 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f
am: c12af8d012

Change-Id: I5c9fd14d532b95caaceb8ca8b5e70feee77c34a0
2017-07-12 19:24:29 +00:00
Tom Taylor c12af8d012 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b
am: f9b9dc3d2f

Change-Id: Ica8bedeb18ee6604e1382f54f0ad910b7cfa8c40
2017-07-12 19:20:09 +00:00
Tom Taylor f9b9dc3d2f 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2
am: cbed68f73b

Change-Id: I66781d5390231f55da0ead3293010a240c632ff8
2017-07-12 19:15:11 +00:00
Tom Taylor cbed68f73b 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4
am: 93d52cb5e2

Change-Id: I35c5b7ee69984e1c91c63c9cf78af9d1c0e0ab43
2017-07-12 19:12:40 +00:00
Tom Taylor 93d52cb5e2 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1
am: a072033ce4

Change-Id: I2ead912804b75f6633d04259e0bdd61f2b4aad5f
2017-07-12 19:11:39 +00:00
Tom Taylor a072033ce4 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4
am: 6ea30b87b1

Change-Id: I28cfc0b9abbc28420feec7c690406ebe922b31e8
2017-07-12 19:09:10 +00:00
Tom Taylor 6ea30b87b1 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360
am: 7a6b99a4a4

Change-Id: I0817d9c8e4e30630cd0008f93ee31a728342eae1
2017-07-12 19:07:09 +00:00
Tom Taylor 7a6b99a4a4 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec
am: 22bbfd7360

Change-Id: Ibe13d61b03cc6ae40d6782bf7ae045b5aeb491de
2017-07-12 19:06:10 +00:00
Tom Taylor 22bbfd7360 37742976 - Catch bad gifs am: e0f247e399
am: 7c28ca34ec

Change-Id: I0dad7e115a279290a51ee652dbd6a4f9b7ab7081
2017-07-12 19:02:38 +00:00
Tom Taylor 7c28ca34ec 37742976 - Catch bad gifs
am: e0f247e399

Change-Id: I54307fd0a08e1ecc14b2f3be5b8d52fac6ff7033
2017-07-12 19:01:08 +00:00
Tom Taylor e0f247e399 37742976 - Catch bad gifs
* A security researcher crafted a gif that would cause the Android
Bitmap code to throw an NPE. That would cause messaging to crash when
decoding the NPE. Catch the NPE.

Test: manually tested the "crash.gif" attached to the bug. Stepped
through the debugger to verify we're catching the NPE and logging
the attempt. Verified normal gifs still work.

Bug: 37742976

Change-Id: Iab814d5b0b514bed0cecddd9a76f1fc095f90892
(cherry picked from commit 3671fd94ae)
2017-06-23 16:48:57 -07:00
TreeHugger Robot 8bd347d158 Merge "37742976 - Catch bad gifs" 2017-06-23 22:41:29 +00:00
Tom Taylor 3671fd94ae 37742976 - Catch bad gifs
* A security researcher crafted a gif that would cause the Android
Bitmap code to throw an NPE. That would cause messaging to crash when
decoding the NPE. Catch the NPE.

Test: manually tested the "crash.gif" attached to the bug. Stepped
through the debugger to verify we're catching the NPE and logging
the attempt. Verified normal gifs still work.

BUG=37742976

Change-Id: Iab814d5b0b514bed0cecddd9a76f1fc095f90892
2017-06-23 14:09:12 -07:00
Paul Duffin 0cf794c98b Fix dependencies of packages that target earlier releases am: 7b2c6ed6a5 am: 37f70d2951 am: 3fb6abb421
am: eaa925147a

Change-Id: If3fca43c17da75f1464640a721ffd61d375506b5
2017-06-14 14:45:17 +00:00
Paul Duffin eaa925147a Fix dependencies of packages that target earlier releases am: 7b2c6ed6a5 am: 37f70d2951
am: 3fb6abb421

Change-Id: Ie95146abc1a8c899e8907c360bcf296a73a8c0d7
2017-06-14 14:42:27 +00:00
Paul Duffin 3fb6abb421 Fix dependencies of packages that target earlier releases am: 7b2c6ed6a5
am: 37f70d2951

Change-Id: I439fd98863bd439008529193d0c6d7f2cba0f73e
2017-06-14 14:40:01 +00:00
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
Aurimas Liutikas 441c8b85a6 Remove usages of ActionBarActivity. am: d3b23f568a
am: 10244bf817

Change-Id: I8a59c98cd83c19aaa373fa1c38b26de6da1a8046
2017-06-06 21:27:52 +00:00
Aurimas Liutikas 10244bf817 Remove usages of ActionBarActivity.
am: d3b23f568a

Change-Id: Ia3525872e1a635f787ac6836ea961d95cc76d57f
2017-06-06 21:24:03 +00:00
Aurimas Liutikas d3b23f568a Remove usages of ActionBarActivity.
ActionBarActivity has been deprecated for 2+ years and has been
extending AppCompatActivity for all that time. These changes
should be no-ops.

Bug: 35253513
Test: None
Change-Id: I699f327aaa99b26a0a0b562cf425203e4b625c33
(cherry picked from commit 11224977e7)
2017-06-06 15:13:49 +00:00
Aurimas Liutikas 11224977e7 Remove usages of ActionBarActivity.
ActionBarActivity has been deprecated for 2+ years and has been
extending AppCompatActivity for all that time. These changes
should be no-ops.

Bug: 35253513
Test: None
Change-Id: I699f327aaa99b26a0a0b562cf425203e4b625c33
2017-05-18 11:16:47 -07:00
Tom Taylor 33e6be1db8 Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev am: 7ffdc9c333
am: a25e716645

Change-Id: I8f77c67dfc3002b2b6d5e20049e0cf715f6ff81e
2017-05-01 18:29:30 +00:00
Tom Taylor a25e716645 Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev
am: 7ffdc9c333

Change-Id: Ibfe8a044ae6dd12fbd4c204150fa410fa6867220
2017-05-01 18:21:56 +00:00
Tom Taylor 7ffdc9c333 Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev 2017-05-01 18:09:08 +00:00
Tom Taylor db45a19fe5 37544704 PduPersister is not doing a safe Uri comparison
* The PduPersister had some code where it checked uris for
equality, but didn't use the safe .equals method.

Test: manual test of sending and receiving mms's.

Bug: 37544704

Change-Id: I6dfd037068b4eff04c34cd9d41760e36e11915d6
2017-05-01 09:21:52 -07:00
Malcolm Chen 7eb0aa9da9 Re-define ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, and ACTION_DEFAULT_SUBSCRIPTION_CHANGED with proper contents. am: 5aa1187f86
am: 54abffd219

Change-Id: Ia086b18fa15351d274a07f33b48a670dbd6fa257
2017-05-01 16:19:47 +00:00
Malcolm Chen 54abffd219 Re-define ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, and ACTION_DEFAULT_SUBSCRIPTION_CHANGED with proper contents.
am: 5aa1187f86

Change-Id: Ibad3f2aa34f89e75ace317a6a7945a79da8e5684
2017-05-01 16:11:07 +00:00
Malcolm Chen 5aa1187f86 Re-define ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, and
ACTION_DEFAULT_SUBSCRIPTION_CHANGED with proper contents.

Bug: 37497166
Test: Manual
Change-Id: I3fb7d33fc45634ff3e9d2240e822a8945285fad2
2017-04-28 11:36:15 -07:00
Sanket Padawe 7424571ac4 Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'. am: 56eaeedbb4 am: efad207abc
am: dd192a650b  -s ours

Change-Id: I286766be1fc7bf035996e3ddd21744f1334f743b
2017-03-23 01:07:04 +00:00
Sanket Padawe dd192a650b Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'. am: 56eaeedbb4
am: efad207abc

Change-Id: Ia56cbe2705ca7db11773cb79373e64cefed56d2a
2017-03-23 00:58:09 +00: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
Sanket Padawe 616dc26461 Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'.
Bug: 35767068
Test: No build failure on update.
Change-Id: Iab619e80da63685212043f88d30c171a013f8925
2017-03-21 11:25:10 -07:00
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