summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Merge "Stop using deprecated methods. am: 20ee0bad10 am: 3157d03e59" into ↵Julia Reynolds2017-06-230-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | oc-dr1-dev-plus-aosp am: e4fcd715cd Change-Id: I50e5eee7fc1cfbc3e75ec3712b1aaf3501cc83ba
| | * | | | | Merge "Stop using deprecated methods. am: 20ee0bad10 am: 3157d03e59" into ↵Android Build Merger (Role)2017-06-230-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | oc-dr1-dev-plus-aosp
| | | * | | | | Stop using deprecated methods. am: 20ee0bad10Julia Reynolds2017-06-231-11/+11
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3157d03e59 Change-Id: Ia8b558b4071fcb9111661dc064cd198e7803adb3
| | | | * | | | Stop using deprecated methods.Julia Reynolds2017-06-231-11/+11
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 20ee0bad10 Change-Id: I26c8e685889305506a640363a8091d330b92c07c
| * | | | | | | Stop using deprecated methods. am: 20ee0bad10 am: 460e0347bfJulia Reynolds2017-06-230-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fd4c19f017 Change-Id: I46ee54a812c46c372daebf43871a86b1a3ac85e0
| | * | | | | | Stop using deprecated methods. am: 20ee0bad10Julia Reynolds2017-06-231-11/+11
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | / / | | | | |_|/ / | | | |/| | | | | | | | | | am: 460e0347bf Change-Id: I8a67c5a141b8b6f9010ac07d6f6b49f942d206bc
| | | * | | | Stop using deprecated methods.Julia Reynolds2017-06-231-11/+11
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | am: 20ee0bad10 Change-Id: Id472681f47e250008a678b198a3b4d0d82a9d9e6
| | | | * | | Stop using deprecated methods.Julia Reynolds2017-06-231-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 37863673 Test: make Change-Id: I4f7ad4f38c21e06235ab8f290ee83a6eebde5b5e (cherry picked from commit 4178c9ecbd0697540844e0d088e307408ec3cf10)
| * | | | | | Merge "Stop using deprecated methods."TreeHugger Robot2017-06-231-11/+11
| |\ \ \ \ \ \
| | * | | | | | Stop using deprecated methods.Julia Reynolds2017-06-231-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 37863673 Test: make Change-Id: I4f7ad4f38c21e06235ab8f290ee83a6eebde5b5e
| * | | | | | | Import translations. DO NOT MERGEBill Yi2017-06-221-4/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4b4c4771f19f3b39c95f654b15431d6ae1fd89a6 Auto-generated-cl: translation import
* | | | | | | release-request-c9e3b153-009d-4386-b83e-337752602795-for-git_oc-mr1-release- ↵android-build-team Robot2017-06-182-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4111654 snap-temp-L22900000075285650 Change-Id: Ibca7dd59b2bac8d4fe25e74e9c1c8f944e663b62
| * | | | | | Import translations. DO NOT MERGEBill Yi2017-06-172-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5ab5952ed4cdb92021ebc2edab5131a9bdf47c81 Auto-generated-cl: translation import
* | | | | | | release-request-b1bd0f0e-f3c4-414e-8f22-d9235831ae23-for-git_oc-mr1-release- ↵android-build-team Robot2017-06-144-27/+119
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4099045 snap-temp-L41300000074003051 Change-Id: Ib46cef1e17966fd2e99d105fa959fbb5915ba661
| * | | | | | Fix NPEs in shortcuts am: 9b1b93772dGary Mai2017-06-143-22/+36
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iedd641ae9bbb18a9a1cbf5d64806ca24ce869e7d
| | * | | | | | Fix NPEs in shortcutsGary Mai2017-06-133-22/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contacts with no data will have null for their display name which in this version isn't caught. Add null checks and use R.string.missing_name when a contact has no display name. Test: Manually verified no crashes on a Pixel with O-DR when : * adding shortcut from overflow menu in QuickContact for a contact with no name * selecting a contact with no name when creating a shortcut by long pressing the home screen Bug: 62590004 Change-Id: If0c5d93a472d1d47c6657f72ae9e202c335de75c
| * | | | | | | DO NOT MERGE Bump AOSP Contacts to 1.7.22 skipped: b121ab7c24Gary Mai2017-06-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I193d1011e46957acf17d4cf4bd5e8ee64ecbe6e0
| | * | | | | | DO NOT MERGE Bump AOSP Contacts to 1.7.22Gary Mai2017-06-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 37984278 Change-Id: Iab069a379798851e32c27089206f7521c54f9863
| * | | | | | | Merge changes from topic 'am-818f1ae6-d9a3-47ab-b7c2-e06c57200377'Gary Mai2017-06-132-5/+83
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Read carrier and device config for enabling Duo am: 8e6856b89d Read carrier and device config for enabling Duo
| | * | | | | | | Read carrier and device config for enabling Duo am: 8e6856b89dGary Mai2017-06-122-5/+83
| | |\| | | | | | | | | |_|/ / / / | | |/| | | | | | | | | | | | | Change-Id: I98a2f47c384f9c2ac23ed524c83f7264c129beca
| | | * | | | | Read carrier and device config for enabling DuoGary Mai2017-06-122-5/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: Manually verified: * Duo fallback is enabled for Pixel running OPD1.170608.001 * Duo fallback is disabled for Nexus 5X running OPP3.170518.004 Bug: 37773868 Change-Id: I8b165566bf9cfe79ae8039cd8d2ec6eff9148376
| * | | | | | | Merge "Fix dependencies of packages that target earlier releases" am: ↵Paul Duffin2017-06-130-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | 41e553f6ec am: c9458971f4 -s ours am: a89e0f4e30 -s ours am: 06e67a3746 -s ours Change-Id: I596922860de8ac84a90765619cf271512df84765
| | * | | | | Merge "Fix dependencies of packages that target earlier releases" am: ↵Paul Duffin2017-06-130-0/+0
| |/| | | | | | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41e553f6ec am: c9458971f4 -s ours am: a89e0f4e30 -s ours Change-Id: I9690a717185c9b399b83c7b5c1dc1ed5139f51b5
| | * | | | Merge "Fix dependencies of packages that target earlier releases" am: 41e553f6ecPaul Duffin2017-06-130-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c9458971f4 -s ours Change-Id: I607713f4bf2381b8b601cc289f2b0b21b2068932
| | | * \ \ \ Merge "Fix dependencies of packages that target earlier releases"Paul Duffin2017-06-132-1/+2
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 41e553f6ec Change-Id: Iaeb2d75c4fb68074b15e725222eebcd73c63ed33
| | | | * \ \ \ Merge "Fix dependencies of packages that target earlier releases"Paul Duffin2017-06-132-1/+2
| | | | |\ \ \ \
| | | | | * | | | Fix dependencies of packages that target earlier releasesPaul Duffin2017-06-132-1/+2
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. * Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because Contacts's manifest file (AndroidManifest.xml) targets API level 25 and dynamically includes the android.test.runner library at runtime so there is no point in statically including the classes. It was not added to LOCAL_JAVA_LIBRARIES because module Contacts does not have any dependencies on android.test classes * tests/Android.mk Added 'android.test.mock.sdk' and 'legacy-android-test' to LOCAL_JAVA_LIBRARIES because module ContactsTests 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. They were not added to LOCAL_STATIC_JAVA_LIBRARIES because ContactsTests's manifest file (AndroidManifest.xml) targets API level 25 and uses the android.test.runner library which will provide the classes dynamically at runtime. Dependency 'android.test.mock.sdk' is used instead of 'android.test.mock' because module ContactsTests 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: Ideccfb3fca76fb4b01823ccd157a222bd2ad4d6d Merged-In: I1a1efd20bce41049e311283fb7b4d9f214b24863
* | | | | | | | release-request-703268f3-975f-4a98-83d7-cbf58019eda0-for-git_oc-mr1-release- ↵android-build-team Robot2017-06-041-6/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4067152 snap-temp-L75700000070444922 Change-Id: Ic4faf482756369812a876553b697e59fc4d7db3b
| * | | | | | | DO NOT MERGE Bump AOSP version to 1.7.14 skipped: aa38ab6d9f skipped: 122a8b0356Gary Mai2017-06-010-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | Change-Id: I8f049e670d96fdec966c9ffbd08c6fe423886da4
| | * | | | | | DO NOT MERGE Bump AOSP version to 1.7.14 skipped: aa38ab6d9fGary Mai2017-06-010-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1cd4efda3ca6d4ea60913de7ab4edaaf5bfd25fd
| | | * | | | | | DO NOT MERGE Bump AOSP version to 1.7.14Gary Mai2017-06-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 33000560 Change-Id: I8056e39ca63ccade6cf07b5faca08118ce7c4550
| * | | | | | | | Fix shortcut icons on O am: dbf3e83dff am: bdde638f2aGary Mai2017-06-011-6/+18
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1d6eebea17084683b020f2f59ee4b59a7629c6c9
| | * | | | | | | Fix shortcut icons on O am: dbf3e83dffGary Mai2017-06-011-6/+18
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If1916abecc35fb8ba27c2932bf3af573c0e0df50
| | | * | | | | | Fix shortcut icons on OGary Mai2017-06-011-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use IconCompat to create the adaptive icons. When attaching the icon to the result intent for ACTION_SHORTCUT on >= O use IconCompat.addToShortcutResult(). Otherwise continue to manually add it for pre-O. Test: Manually verified creating shortcuts on N M and O still work as expected. Bug: 62112388 Change-Id: I07f5a8ffd1f49edb4c21aaa572b42f641111e798
* | | | | | | | | release-request-fad05353-cc19-4c26-af2f-d5c8a574970e-for-git_oc-mr1-release- ↵android-build-team Robot2017-06-011-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4057695 snap-temp-L92600000069427650 Change-Id: I21a986207836dc36a3bb6dcb7981a33ad3ef96f2
| * | | | | | | | Import translations. DO NOT MERGEBill Yi2017-05-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I16b16d0a1e198049fa6d778ab7214339927e52be Auto-generated-cl: translation import
* | | | | | | | | release-request-80d7cd88-53c4-4e65-952a-f34bc86a0841-for-git_oc-mr1-release- ↵android-build-team Robot2017-05-281-41/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4050000 snap-temp-L22200000068540971 Change-Id: Ieaf962a92dbb44d27bed83d464b1c0c7b0ddfcaa
| * | | | | | | | Pass null resource ID (0) to AlertDialog constructor am: 068bb3272cWenyi Wang2017-05-261-41/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idf8f4fec3b127c7a8099e737af422c1183bec52b
| | * | | | | | | Pass null resource ID (0) to AlertDialog constructorWenyi Wang2017-05-261-41/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Including some cleanup Bug: 38393777 Test: manually verified date picker dialog style is correct Change-Id: I1f843fbe4d9ea8e29a5ce72303720e2c50371ad6
* | | | | | | | | release-request-e81235f1-b2b4-4de1-b974-255760176f06-for-git_oc-mr1-release- ↵android-build-team Robot2017-05-241-7/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4040405 snap-temp-L68200000067456736 Change-Id: I872d2d7c8321a72987e07614050133c67904fadf
| * | | | | | | | Import translations. DO NOT MERGEBill Yi2017-05-241-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I32dd9fffa1ba0f83f9d79b55438b50f78aea53a5 Auto-generated-cl: translation import
* | | | | | | | | release-request-91ef8626-1af7-4595-b2bd-2d85ee97e99f-for-git_oc-mr1-release- ↵android-build-team Robot2017-05-211-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4029936 snap-temp-L27200000066301195 Change-Id: I34a03262bb87bbe78c8c674e53939c1761155575
| * | | | | | | | Bump AOSP version to 1.7.21 am: e1be5ce0beMarcus Hagerott2017-05-181-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5260acf25282794fc467b5910d3dcb3071dff502
| | * | | | | | | Bump AOSP version to 1.7.21Marcus Hagerott2017-05-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 33000560 Change-Id: I889be5dc7e9acd8a05a955bc5e11e7cd272a5aa1
* | | | | | | | | release-request-323db86e-b638-4d24-8eb1-d2e3bf4a9d1a-for-git_oc-mr1-release- ↵android-build-team Robot2017-05-1730-131/+225
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4017779 snap-temp-L47900000064949209 Change-Id: I192bb750107f90fe42d03b52eb74c18f54c78507
| * | | | | | | | Merge changes from topic 'am-b7e40a4c-b364-433f-8a7c-b0153888999f'TreeHugger Robot2017-05-161-3/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Remove FLAG_ACTIVITY_NEW_TASK when starting tachyon am: 9649af1903 Remove FLAG_ACTIVITY_NEW_TASK when starting tachyon
| | * | | | | | | | Remove FLAG_ACTIVITY_NEW_TASK when starting tachyon am: 9649af1903Gary Mai2017-05-161-3/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iee4be6b496a2226a9dbac8486b719764908ceb7e
| | | * | | | | | | Remove FLAG_ACTIVITY_NEW_TASK when starting tachyonGary Mai2017-05-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having this flag conflicts with startActivityWithResult which results in not passing the signature check on the other side. Test: Manually verified the video calls are started without needing to confirm. Bug: 36874501 Change-Id: Icd45076ad03438e00a00403109503600f6e18b26
| * | | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-162-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Import translations. DO NOT MERGEBill Yi2017-05-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5685cda2506453f61393c4cf65a22e025e91adb5 Auto-generated-cl: translation import
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 23:58:36 +0000