aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-25release-request-7bfcab52-d1c0-4256-9d6b-5b5092bc78ca-for-git_oc-mr1-release- ↵android-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-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-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_r9android-8.1.0_r81android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseandroid-build-team Robot
4133428 snap-temp-L95800000077479875 Change-Id: Id234852c24abad58c89ab287febc3be403ebd59a
2017-06-22Merge "Add OWNERS in external/dexmaker" am: 9e6367a939 am: 14d593e1c3 am: ↵oreo-mr1-devChih-hung Hsieh
d9c3d7ebd3 am: 685ec95f5d Change-Id: I0964381da786b87178d62eb68af3b60c8e33b56b
2017-06-22Merge "Add OWNERS in external/dexmaker" am: 9e6367a939 am: 14d593e1c3Chih-hung Hsieh
am: d9c3d7ebd3 Change-Id: Iae65bf9f287f18d9cb6245d15cd979bfa8cc128b
2017-06-22Merge "Add OWNERS in external/dexmaker" am: 9e6367a939android-o-mr1-preview-2android-o-mr1-preview-1Chih-hung Hsieh
am: 14d593e1c3 Change-Id: I3796b3ba07f0cc4e09172cb3fce6b07da23872b1
2017-06-22Merge "Add OWNERS in external/dexmaker"Chih-hung Hsieh
am: 9e6367a939 Change-Id: I9859ed834763cc998a8a82689e696da945d4ca40
2017-06-22Merge "Add OWNERS in external/dexmaker"android-o-preview-4android-o-iot-preview-5o-iot-preview-5Chih-hung Hsieh
2017-06-20Add OWNERS in external/dexmakerChih-Hung Hsieh
* Owners are selected from top CL approvals or owners. They will be suggested to review/approve future CLs. * OWNERS files are recognized by the new find-owners plugin, see .md files in https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/ Test: build/make/tools/checkowners.py -c -v OWNERS Change-Id: Idd371482a9e0929e60782b5c0d8d19698fecbe83
2017-05-23release-request-f2cd0207-2ed0-4e33-859f-0df0378165b1-for-git_oc-mr1-release- ↵android-build-team Robot
4033857 snap-temp-L00900000066751756 Change-Id: I01e5436a7191baf316c87a20b55688ba1deef24c
2017-05-22Merge "Fix DefaultStackTraceCleaner to use the updated package name" am: ↵oreo-dr1-devEtan Cohen
a22ad79d7a am: 21b0422bd2 am: 1ad52091a4 am: 3339e6bdc5 Change-Id: I91d1a6d037bee81c8839944e313ad80699aa3d62
2017-05-22Merge "Fix DefaultStackTraceCleaner to use the updated package name" am: ↵Etan Cohen
a22ad79d7a am: 21b0422bd2 am: 1ad52091a4 Change-Id: I6149a52c3297b23534f2587708ed43388b20f2d2
2017-05-22Merge "Fix DefaultStackTraceCleaner to use the updated package name" am: ↵Etan Cohen
a22ad79d7a am: 21b0422bd2 Change-Id: Ib5a5cd5cec7b002183eefe341263e7fabd9a823f
2017-05-22Merge "Fix DefaultStackTraceCleaner to use the updated package name"Etan Cohen
am: a22ad79d7a Change-Id: I21b5c918f424a7d53e7d7b1692ec71404b486aed
2017-05-22Merge "Fix DefaultStackTraceCleaner to use the updated package name"android-o-preview-3Etan Cohen
2017-05-19Fix DefaultStackTraceCleaner to use the updated package nameEtan Cohen
Bug: 38459314 Test: builds and produces correct stack trace Change-Id: I759dc8bee74ef163e7e78017dc71b1c6d999ee17
2017-03-24Merge "Update .gitignore file to ignore IntelliJ IDEA files" am: 688063bf33 ↵android-vts-8.0_r2android-vts-8.0_r1oreo-devPaul Duffin
am: 4d6bad69af am: 104527a9d8 Change-Id: I92873b5baf0fc69f668f799e0ab359d3583f5b14
2017-03-24Merge "Update .gitignore file to ignore IntelliJ IDEA files" am: 688063bf33Paul Duffin
am: 4d6bad69af Change-Id: Ie6e855135de205a0579641c06485055865a0746e
2017-03-24Merge "Update .gitignore file to ignore IntelliJ IDEA files"android-wear-o-preview-4android-wear-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4Paul Duffin
am: 688063bf33 Change-Id: I17ffe8568e7752906bdf17135b54da8fc7389b49
2017-03-24Merge "Update .gitignore file to ignore IntelliJ IDEA files"Treehugger Robot
2017-03-24Update .gitignore file to ignore IntelliJ IDEA filesPaul Duffin
Test: git status to make sure the files do not appear Change-Id: I25cd8f7453bfbf44cd5020682dca655e0c8585a6
2017-03-21Merge "Scan for methods in extra interface hierarchy" am: ce33604360 am: ↵Paul Duffin
3a1969b22c am: f6dc7c07e1 Change-Id: I549a67291bbb4f73c255eab62b93d468a7f9433e
2017-03-21Merge "Scan for methods in extra interface hierarchy" am: ce33604360Paul Duffin
am: 3a1969b22c Change-Id: I5828b40d1850bdfe09a1c13fe640184e5f34191a
2017-03-21Merge "Scan for methods in extra interface hierarchy"Paul Duffin
am: ce33604360 Change-Id: I799c7ec9704e1511eb2b44e10e390b796b936294
2017-03-21Merge "Scan for methods in extra interface hierarchy"Treehugger Robot
2017-03-21Scan for methods in extra interface hierarchyPaul Duffin
The ProxyBuilder was not traversing the interface hierarchy of the extra interfaces provided by the caller to find methods to proxy. That resulted in an AbstractMethodError when those methods were called. (cherry picked from d6b8d02d4fc7d57f0b72dba598b6320ef02a8213) Bug: 36407367 Bug: 32912773 Test: Added a failing test then fixed it, reran tests Change-Id: If68105da3b7e62383c8fa8ececc21383b299d854
2017-03-17Merge "Remove unneeded call to all-makefiles-under" am: 7c8fd7bceb am: ↵Paul Duffin
6d76c08eef am: c46d54071f Change-Id: Ia4423d6e889c0b6bc201059f4f4865bdb60de3b6
2017-03-17Merge "Remove unneeded call to all-makefiles-under" am: 7c8fd7bcebPaul Duffin
am: 6d76c08eef Change-Id: I78cf17e2add443bc9591dda53b44d4edea71e860
2017-03-17Merge "Remove unneeded call to all-makefiles-under"Paul Duffin
am: 7c8fd7bceb Change-Id: I410ded4ea3bf451907d2a5c1dd1ccfa7c83114d5
2017-03-17Merge "Remove unneeded call to all-makefiles-under"Treehugger Robot
2017-03-17Remove unneeded call to all-makefiles-underPaul Duffin
It was only added to prevent conflicts with downstream and it is no longer needed downstream. Bug: 32912773 Test: make checkbuild Change-Id: Ifc28f20e1e759e91896eea9c50bd962c5956df85
2017-03-17Remove unused mockito-updated/ directoryPaul Duffin
Bug: 32912773 Test: make checkbuild Change-Id: I0b488bc556906aaf6d39343175943db4f4bbac24
2017-03-17Merge changes from topic 'upgrade-mockito-2.7.13' am: 03a4347fc5 am: 3c2f2eb7a8Paul Duffin
am: 4f0594fd91 Change-Id: Icd8857a84b774f857b5d2aa4ba283121a63529b9
2017-03-17Merge changes from topic 'upgrade-mockito-2.7.13' am: 03a4347fc5Paul Duffin
am: 3c2f2eb7a8 Change-Id: I4d6d4d74a655a47bf0600fa18e24ec87336cab63
2017-03-17Merge changes from topic 'upgrade-mockito-2.7.13'Paul Duffin
am: 03a4347fc5 Change-Id: Ib9b3dcfd2c79fc7074e29132ff4fc11093ecd210
2017-03-17Merge changes from topic 'upgrade-mockito-2.7.13'Paul Duffin
* changes: Reapply - Hacks to allow mocking of package private classes Update to version 2.2.0 and make it build
2017-03-16Merge "Break dependency between dexmaker-mockmaker-updated and dexmaker"TreeHugger Robot
2017-03-16Break dependency between dexmaker-mockmaker-updated and dexmakerPaul Duffin
The mockito upgrade will update the dexmaker source in a way that will be incompatible with dexmaker-mockmaker-updated. This change temporarily copies the current dexmaker source into dexmaker-mockmaker-updated so that the dependency on dexmaker can be removed. That will allow dexmaker to be upgraded independently of dexmaker-mockmaker-updated. Bug: 32912773 Test: make checkbuild Change-Id: Ic7d6254c942db0cac2d93e483532823e1ccc8bdf
2017-03-16Merge changes I254bb2aa,I99ee23d0 am: feab4dcdd7 am: 097c396cabPaul Duffin
am: 771fad4933 Change-Id: Ia9cb3321b07c5c157632e90fdc9dc51372eefb06
2017-03-16Merge changes I254bb2aa,I99ee23d0 am: feab4dcdd7Paul Duffin
am: 097c396cab Change-Id: I571717df2723e4b0170d7fae6fc68886ee036580
2017-03-16Merge changes I254bb2aa,I99ee23d0Paul Duffin
am: feab4dcdd7 Change-Id: If4d405797961d000fca7331ba14c3564aab1ad86
2017-03-16Merge changes I254bb2aa,I99ee23d0android-n-mr2-preview-2Paul Duffin
* changes: Added update_source.sh script to simplify updating Clean up file structure to make more like upstream
2017-03-16Merge "Hacks to allow mocking of package private classes" am: 4dbea06afc am: ↵Paul Duffin
1f0f8521e7 am: 1351f1f1d5 -s ours Change-Id: I939fb456ad7ed80705b6405197e27a32e5fe01d9
2017-03-16Merge "Hacks to allow mocking of package private classes" am: 4dbea06afcPaul Duffin
am: 1f0f8521e7 Change-Id: I6e2d728410b6100b31ce804078be79141eabb7e7
2017-03-16Merge "Hacks to allow mocking of package private classes"Paul Duffin
am: 4dbea06afc Change-Id: Ic9a879f42c5eb8a93c95939324886f4c385c985b
2017-03-16Merge "Hacks to allow mocking of package private classes"Paul Duffin
2017-03-16Reapply - Hacks to allow mocking of package private classesPaul Duffin
2 things are required to allow mocking for package private classes. First is creating the mock in the same class as the base, that part is simple and seems to have no effect. The second is to have a matching ClassLoader as the source class. To make the classloader match, instead of generating a new ClassLoader, add the new dex to the existing one and share the base class's ClassLoader. Since this is a persistent change and could affect the process, it will be opt-in through setting a system property. This also appears to have unintended speedup in the tests I was testing, possible through cache fixes or brokenness. (cherry picked from commit 31b974435499d3c9769ed6a746e946187f3be64f) Test: Add System.setProperty("dexmaker.share_classloader", "true) to SysuiTestCase then runtest systemui Change-Id: I35c805ee3797ff151ac19bd0c931ebfd41d3b670
2017-03-15Merge "Make Android.mk the same as downstream to avoid conflicts" am: ↵Paul Duffin
7d2fa18cfd am: 3072f56bf9 am: c08cb05855 -s ours Change-Id: I0b1d28f130b2c9457e56b17964062f52fdfa930f
2017-03-15Merge "Make Android.mk the same as downstream to avoid conflicts" am: 7d2fa18cfdPaul Duffin
am: 3072f56bf9 Change-Id: Ied55447a804dc54ab3f1c15888fbd0bcff898e41
2017-03-15Update to version 2.2.0 and make it buildPaul Duffin
Updated using ./update_source.sh 2.2.0 Added lib directory to contain prebuilt versions of the dx and dex libraries to replace the contents of the dx directory which was deleted upstream. Bug: 36231644 Test: make checkbuild Change-Id: I31de03f40e4af097be01b5d9f2fe2c71ae879b54
2017-03-15Merge "Make Android.mk the same as downstream to avoid conflicts"Paul Duffin
am: 7d2fa18cfd Change-Id: I6328169ac2cd931aa0ac0f2b35b9873f9d1c83d5
2017-03-15Added update_source.sh script to simplify updatingPaul Duffin
Bug: 36231644 Test: See following commit Change-Id: I254bb2aa2e36e0c310d4bda3f3c2d1d873e8f41b
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 02:37:47 +0000