aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-10-09Snap for 4384531 from 5da8ff6b9b84a5e0bea6d4ae1264b712369ed7e1 to oc-m2-releaseandroid-8.1.0_r8android-8.1.0_r41android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r30android-8.1.0_r26android-8.1.0_r25android-8.1.0_r20android-8.1.0_r2oreo-m6-s2-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseandroid-build-team Robot
Change-Id: Ief58595230488aef1c71cd823438fa856a48024d
2017-10-03Snap for 4373604 from b2dd6a8ef54b233843b463204ec4e3b67148a7e8 to oc-mr1-releaseandroid-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1oreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m4-s1-releaseandroid-build-team Robot
Change-Id: I9999dde7294e45b7a2c535c34c33e687da7a3e69
2017-07-1237742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: ↵oreo-mr1-devTom Taylor
7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012 am: 3f22a4820c am: 443a8888f2 Change-Id: I85c47a8571a609321e2c3e0dd4f2a2b57015e839
2017-07-1237742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: ↵Tom Taylor
7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012 am: 7ace2d5308 am: cb822ae902 Change-Id: I0b28ce9619853b280cd93af783b93d6aff92bc4f
2017-07-1237742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: ↵Tom Taylor
7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012 am: 3f22a4820c Change-Id: I3007cf14803262bbb6f28db602b16252ebc4a62c
2017-07-1237742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: ↵Tom Taylor
7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012 am: 7ace2d5308 Change-Id: I1872889b944cdffa63bafd7a125315d2fe2d7917
2017-07-1237742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: ↵oreo-dr1-devTom Taylor
7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012 Change-Id: I70465c2290a2ba08d7647acab20bdfb25e8b3ecd
2017-07-1237742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: ↵Tom Taylor
7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012 Change-Id: I5c9fd14d532b95caaceb8ca8b5e70feee77c34a0
2017-07-1237742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: ↵android-vts-8.0_r2android-vts-8.0_r1Tom Taylor
7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f Change-Id: Ica8bedeb18ee6604e1382f54f0ad910b7cfa8c40
2017-07-1237742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: ↵Tom Taylor
7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b Change-Id: I66781d5390231f55da0ead3293010a240c632ff8
2017-07-1237742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: ↵Tom Taylor
7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 Change-Id: I35c5b7ee69984e1c91c63c9cf78af9d1c0e0ab43
2017-07-1237742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: ↵Tom Taylor
7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 Change-Id: I2ead912804b75f6633d04259e0bdd61f2b4aad5f
2017-07-1237742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: ↵Tom Taylor
7a6b99a4a4 am: 6ea30b87b1 Change-Id: I28cfc0b9abbc28420feec7c690406ebe922b31e8
2017-07-1237742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360Tom Taylor
am: 7a6b99a4a4 Change-Id: I0817d9c8e4e30630cd0008f93ee31a728342eae1
2017-07-1237742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ecTom Taylor
am: 22bbfd7360 Change-Id: Ibe13d61b03cc6ae40d6782bf7ae045b5aeb491de
2017-07-1237742976 - Catch bad gifs am: e0f247e399Tom Taylor
am: 7c28ca34ec Change-Id: I0dad7e115a279290a51ee652dbd6a4f9b7ab7081
2017-07-1237742976 - Catch bad gifsTom Taylor
am: e0f247e399 Change-Id: I54307fd0a08e1ecc14b2f3be5b8d52fac6ff7033
2017-06-25release-request-7bfcab52-d1c0-4256-9d6b-5b5092bc78ca-for-git_oc-mr1-release- ↵android-build-team Robot
4133428 snap-temp-L95800000077479875 Change-Id: Ia89b0b3aacb5bb065bf7a89e0843ef4754f4bf5a
2017-06-2337742976 - Catch bad gifsTom Taylor
* 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 3671fd94ae1aad5c51d0730066e7f0c7b4c893ce)
2017-06-23Merge "37742976 - Catch bad gifs"TreeHugger Robot
2017-06-2337742976 - Catch bad gifsTom Taylor
* 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-15release-request-f7cf88d3-9ff3-4602-981e-79c555d8aa91-for-git_oc-mr1-release- ↵android-build-team Robot
4102303 snap-temp-L92600000074342209 Change-Id: I6c8bf2df1cc6af2882b16e3e916b145b6f0ef520
2017-06-14Fix dependencies of packages that target earlier releases am: 7b2c6ed6a5 am: ↵Paul Duffin
37f70d2951 am: 3fb6abb421 am: eaa925147a Change-Id: If3fca43c17da75f1464640a721ffd61d375506b5
2017-06-14Fix dependencies of packages that target earlier releases am: 7b2c6ed6a5 am: ↵Paul Duffin
37f70d2951 am: 3fb6abb421 Change-Id: Ie95146abc1a8c899e8907c360bcf296a73a8c0d7
2017-06-14Fix dependencies of packages that target earlier releases am: 7b2c6ed6a5android-o-mr1-preview-2android-o-mr1-preview-1Paul Duffin
am: 37f70d2951 Change-Id: I439fd98863bd439008529193d0c6d7f2cba0f73e
2017-06-14Fix dependencies of packages that target earlier releasesPaul Duffin
am: 7b2c6ed6a5 Change-Id: I82c88cdf42903770c7cbbc23e3f0b0394c833089
2017-06-13Fix dependencies of packages that target earlier releasesandroid-o-preview-4android-o-iot-preview-5o-iot-preview-5Paul Duffin
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-06Remove usages of ActionBarActivity. am: d3b23f568aAurimas Liutikas
am: 10244bf817 Change-Id: I8a59c98cd83c19aaa373fa1c38b26de6da1a8046
2017-06-06Remove usages of ActionBarActivity.Aurimas Liutikas
am: d3b23f568a Change-Id: Ia3525872e1a635f787ac6836ea961d95cc76d57f
2017-06-06Remove usages of ActionBarActivity.oreo-devAurimas Liutikas
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 11224977e72b1576cf6fff0c2154361a9d2ded2e)
2017-05-21release-request-91ef8626-1af7-4595-b2bd-2d85ee97e99f-for-git_oc-mr1-release- ↵android-build-team Robot
4029936 snap-temp-L27200000066301195 Change-Id: I0bc1003d16a2ebce547f0444ed40196460c0c6fa
2017-05-18Remove usages of ActionBarActivity.Aurimas Liutikas
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-17release-request-655284b0-7f0b-48b5-b01d-27f48a99f2c0-for-git_oc-mr1-release- ↵android-build-team Robot
4017105 snap-temp-L82600000064873863 Change-Id: I242ac1b372312cddada3735a91ff952cc4e03b21
2017-05-01Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev ↵Tom Taylor
am: 7ffdc9c333 am: a25e716645 Change-Id: I8f77c67dfc3002b2b6d5e20049e0cf715f6ff81e
2017-05-01Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-devTom Taylor
am: 7ffdc9c333 Change-Id: Ibfe8a044ae6dd12fbd4c204150fa410fa6867220
2017-05-01Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-devTom Taylor
2017-05-0137544704 PduPersister is not doing a safe Uri comparisonTom Taylor
* 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-01Re-define ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, and ↵Malcolm Chen
ACTION_DEFAULT_SUBSCRIPTION_CHANGED with proper contents. am: 5aa1187f86 am: 54abffd219 Change-Id: Ia086b18fa15351d274a07f33b48a670dbd6fa257
2017-05-01Re-define ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, and ↵Malcolm Chen
ACTION_DEFAULT_SUBSCRIPTION_CHANGED with proper contents. am: 5aa1187f86 Change-Id: Ibad3f2aa34f89e75ace317a6a7945a79da8e5684
2017-04-28Re-define ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, andMalcolm Chen
ACTION_DEFAULT_SUBSCRIPTION_CHANGED with proper contents. Bug: 37497166 Test: Manual Change-Id: I3fb7d33fc45634ff3e9d2240e822a8945285fad2
2017-03-23Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'. am: ↵Sanket Padawe
56eaeedbb4 am: efad207abc am: dd192a650b -s ours Change-Id: I286766be1fc7bf035996e3ddd21744f1334f743b
2017-03-23Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'. am: ↵Sanket Padawe
56eaeedbb4 am: efad207abc Change-Id: Ia56cbe2705ca7db11773cb79373e64cefed56d2a
2017-03-23Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'.android-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4Sanket Padawe
am: 56eaeedbb4 Change-Id: I6ff74db8a3bcc83768418293a4410e1b05daa732
2017-03-21Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'.Sanket Padawe
Bug: 35767068 Test: No build failure on update. Change-Id: Iab619e80da63685212043f88d30c171a013f8925 Merged-in: Iab619e80da63685212043f88d30c171a013f8925
2017-03-21Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'.Sanket Padawe
Bug: 35767068 Test: No build failure on update. Change-Id: Iab619e80da63685212043f88d30c171a013f8925
2017-03-15Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: ↵Matt Sarett
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-15Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: ↵Matt Sarett
0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 am: 172aeda52b am: d7b191a016 am: ffa6f9ac89 am: ebe4ce865f Change-Id: I33a345152cc1c2eebc1ac7be4ee8c9649f4794a1
2017-03-15Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: ↵Matt Sarett
0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 am: 172aeda52b am: d7b191a016 am: ffa6f9ac89 Change-Id: Ib6053a2965920cb2487f1d697ba51d26a275eea4
2017-03-15Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: ↵Matt Sarett
0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 am: 172aeda52b am: d7b191a016 Change-Id: I1637b3f32e85d91c16d64ccfcb7227fb55b8dbd7
2017-03-15Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: ↵Matt Sarett
0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 am: 172aeda52b Change-Id: I0b3f11dfc15470583a2890ed54406d96dd0cbfe9
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 17:42:28 +0000