aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-02-06Reland: Rework platform version to hide codenames.r_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-cts-11.0_r2android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-b-releaseDianne Hackborn
The public platform version no longer can be a codename, it is always the most recently released platform. A new build property and API provides either the offical version or the current codename as appropriate. This will avoid breaking apps that look at the platform version while development is under a codename. Bug: 143175463 Change-Id: I8a2c8d37bb61cb7fba34c929b2ada5b33906ceb1 Test: manual Exempt-From-Owner-Approval: Previously approved, no new changes
2020-01-28Merge "guessPath not to depend on the first level of app directory" am: ↵Automerger Merge Worker
f4a8107e98 am: d2a09b882a am: 2831341642 Change-Id: I58fb4da45d511539fc838fef0404ccf2e30aed62
2020-01-28Merge "guessPath not to depend on the first level of app directory" am: ↵Automerger Merge Worker
f4a8107e98 am: d2a09b882a Change-Id: Ibca59b3ed6290e3b0fcd60dedfad60ca18b789f7
2020-01-28Merge "guessPath not to depend on the first level of app directory"android-r-preview-4android-r-preview-3android-r-preview-2Songchun Fan
am: f4a8107e98 Change-Id: I7c83e02d0148b6b5cac18aebc0ae2bdf91f207bf
2020-01-28Merge "guessPath not to depend on the first level of app directory"android-r-preview-1Songchun Fan
2020-01-27guessPath not to depend on the first level of app directorySongchun Fan
We are updating apps' apk path to have a two-level structure. Default apk path of an installed app: Before: /data/app/[packageName]-[randomString]/base.apk After: /data/app/[randomStringA]/[packageName]-[randomStringB]/base.apk This CL fixes the path guessing assumption the apk dir is only one level below the /data/app dir. Test: atest DexmakerTests BUG: 148237378 Change-Id: I66f1d7036949c2f05e6d37bc270d47f8e77e51c1
2019-11-14Revert submissionKevin Lau Fang
Reason for revert: This causes a boot issue on Taimen (b/144480969). It wasn't caught by TreeHugger due to Taimen tests being disabled due to a different lab outage (b/144350336). Change-Id: Ib25795eb518f3ae0e7f221eb019f05d5ae6ce553
2019-11-11Rework platform version to hide codenames.Dianne Hackborn
The public platform version no longer can be a codename, it is always the most recently released platform. A new build property and API provides either the offical version or the current codename as appropriate. This will avoid breaking apps that look at the platform version while development is under a codename. Bug: 143175463 Test: manual Change-Id: I3f4e9c7f78219de1d37b4ccdfa1aff65a5f438e0
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 852829233e am: a4d04355bc -s ours am skip reason: subject contains skip directive Change-Id: I58a5456f3d7e0664fb82a9709aaaa0aca28aa9ce
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master am: 852829233e Change-Id: I7059f579c07e609c7101acb8b950787d694780e1
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I2ec8f55d70b7a3d57e9575262b72f1149d60551c
2019-10-16Skip QD1A.190821.011 in stage-aosp-master am: b50d3b546a am: ca8288ae35Xin Li
am: 8cc0c1d532 Change-Id: Id4bb2ac67893dd6eb50930f978f3ded2f6ab84c4
2019-10-16Skip QD1A.190821.011 in stage-aosp-master am: b50d3b546aXin Li
am: ca8288ae35 Change-Id: If4b2d483beead8687a746436fbeb5c61015d6da5
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterXin Li
am: b50d3b546a Change-Id: I78300f05118f0de9971cc328f47e279941905860
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterXin Li
Bug: 141248619 Change-Id: I83cf6590c928e38b1aee4f7af5615243f04c15bb
2019-09-13Merge "Extend the Stress#mockALot() timeout for CTS." am: 14081cd0e4 am: ↵ke.zhao
e1a1eceb9a am: d8cf9a5c46 am: 27390712a2 Change-Id: Id10adf3750b8cf9c594410e1cc800409a47a9a0a
2019-09-13Merge "Extend the Stress#mockALot() timeout for CTS." am: 14081cd0e4 am: ↵ke.zhao
e1a1eceb9a am: d8cf9a5c46 Change-Id: Icc97c3238c791bb08090f6c12adaac119082dad0
2019-09-13Merge "Extend the Stress#mockALot() timeout for CTS." am: 14081cd0e4ke.zhao
am: e1a1eceb9a Change-Id: I058b7ae8e8c57dccf966725ac0fcc42a88f963c1
2019-09-13Merge "Extend the Stress#mockALot() timeout for CTS."ke.zhao
am: 14081cd0e4 Change-Id: Id6d79d1b2182d06e6300e75a76adcbb8f490f316
2019-09-13Merge "Extend the Stress#mockALot() timeout for CTS."ndk-sysroot-r21Treehugger Robot
2019-09-12Extend the Stress#mockALot() timeout for CTS.ke.zhao
Low-performance phones may not be able to finish the test within 300s. Bug: 140516795 Test: OEM confirmed that they can pass CTS now. Change-Id: Iad30a8cb07b38054b490b7006d11908fc752a024
2019-09-10Merge changes from topic "mockito-dexmaker-update-revert" am: eb0ac321a9 am: ↵Garfield Tan
c48aee2265 am: 9c4802c87b am: 9bd3ae4dfe Change-Id: If046e1a2c8dd761b158d6275edc9358400f7469a
2019-09-10Merge changes from topic "mockito-dexmaker-update-revert" am: eb0ac321a9 am: ↵Garfield Tan
c48aee2265 am: 9c4802c87b Change-Id: Id930f285c0737f1fc4330c51b8a66a115753b307
2019-09-10Merge changes from topic "mockito-dexmaker-update-revert" am: eb0ac321a9Garfield Tan
am: c48aee2265 Change-Id: I02fc87043f3618bacf75df6603f0dee3c1add1d5
2019-09-10Merge changes from topic "mockito-dexmaker-update-revert"Garfield Tan
am: eb0ac321a9 Change-Id: If6cdea827953005ce0e1e50224b2b3f65c542398
2019-09-11Merge changes from topic "mockito-dexmaker-update-revert"Treehugger Robot
* changes: Reland "Update to Mockito 2.25.0 and impl InlineMockMaker." Reland "Restrict InspectClass to current thread." Revert "Update dexmaker to latest master."
2019-09-10Reland "Update to Mockito 2.25.0 and impl InlineMockMaker."Garfield Tan
This reverts commit af29ec14cc2419ba013ffd2f66ee26b5541d098d. Bug: 140773999 Test: Builds. Change-Id: I76ce490869000e95f62f7dc9ff0c8fa013dabc71
2019-09-10Reland "Restrict InspectClass to current thread."Garfield Tan
This reverts commit 4d7ae990719d81b616a08de466f9fcc043ec4d4a. Bug: 140773999 Test: Builds. Change-Id: I547bc175c0fb9da40c6336cb409e81042be16c6f
2019-09-10Revert "Update dexmaker to latest master."Garfield Tan
This reverts commit 239c31c6027c14879646948d62c6bbc6a886361d. Bug: 140773999 Test: Builds. Change-Id: Iaa46762ee841eb4a502439ce2c3534b1cc857d07
2019-09-10Make an empty commit to create a merge in target.Garfield Tan
So that we can safely revert Mockito/Dexmaker update in AOSP. Bug: 140773999 Test: None Change-Id: If2175faaed18a84e9d24cee9099ad13946f94e79
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 92b8670f8e -s ours am: 6c83dc864e -s ours am: be577ced1c -s ours am skip reason: change_id I764bd96abd906855d0ccd58cb5b02ab70cbf73c4 with SHA1 3a1b78751f is in history Change-Id: I2034bbf1c6eabafae27f637e0884123cbd0f7edf
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 92b8670f8e -s ours am: 6c83dc864e -s ours am skip reason: change_id I764bd96abd906855d0ccd58cb5b02ab70cbf73c4 with SHA1 3a1b78751f is in history Change-Id: Iecdd1c1fbcc070728e1d74d8797560569468b4b1
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 92b8670f8e -s ours am skip reason: change_id I764bd96abd906855d0ccd58cb5b02ab70cbf73c4 with SHA1 3a1b78751f is in history Change-Id: I5eebdf571191e171e9339519775d04b53a0867f7
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I1dc80282e1b18e6ccbfb22102c812f8578d68b04 Merged-In: I764bd96abd906855d0ccd58cb5b02ab70cbf73c4
2019-09-06Merge changes from topic "update-mockito-dexmaker" am: e59c40a8cb am: ↵Garfield Tan
3a1b78751f am: 3c76f96cb1 am: f2248c8d19 am: 16ceaa7da4 Change-Id: I4c34843f7740535cfd000de2f88be907cf3a4ff0
2019-09-06Merge changes from topic "update-mockito-dexmaker" am: e59c40a8cb am: ↵Garfield Tan
3a1b78751f am: 3c76f96cb1 am: f2248c8d19 Change-Id: Icf9f73c2e32e930845ea28e96fc52692773f94f7
2019-09-06Merge changes from topic "update-mockito-dexmaker" am: e59c40a8cb am: 3a1b78751fGarfield Tan
am: 3c76f96cb1 Change-Id: I592f9804c6ce79b7b023cdefb15a7d384fa4037d
2019-09-06Merge changes from topic "update-mockito-dexmaker" am: e59c40a8cbGarfield Tan
am: 3a1b78751f Change-Id: Ie29ea11fc3ab0043f8bab7bf243fa859622ce0b8
2019-09-06Merge changes from topic "update-mockito-dexmaker"Garfield Tan
am: e59c40a8cb Change-Id: I764bd96abd906855d0ccd58cb5b02ab70cbf73c4
2019-09-06Merge changes from topic "update-mockito-dexmaker"Garfield Tan
* changes: Update dexmaker to latest master. Revert "Restrict InspectClass to current thread." Revert "Update to Mockito 2.25.0 and impl InlineMockMaker."
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
8f74555e85 -s ours am: 8062ef81bb am: 04a9a30b41 am: 27cdaaccf9 -s ours am skip reason: subject contains skip directive Change-Id: I1f852eab0b2fdb32c352fd89ec975e085f51bf09
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
8f74555e85 -s ours am: 8062ef81bb am: 04a9a30b41 Change-Id: I0bfa6f3e1051d48afcf78ff16caf334983a5f1df
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
8f74555e85 -s ours am: 8062ef81bb Change-Id: I3666885c8e28fcde7b10af8df68cd6d36ce9f4d8
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: 8f74555e85 -s ours am skip reason: subject contains skip directive Change-Id: Ifbaa379b5c29da460f2073691de9fae64c35cd34
2019-09-05Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
2019-09-04DO NOT MERGE - Merge Android 10 into masterXin Li
Bug: 139893257 Change-Id: I569a427aed8a79325d31f878ac90afb4d06ee3b0
2019-08-19Merge "Add additional owners" am: 1f92759998 am: e02f396584 am: 7a7f6fdbc9 ↵Philip P. Moltmann
am: 8b007e3d81 am: 67b9db7033 Change-Id: If7ce1b213280a60bc0a97a0e2a668a36bae94287
2019-08-19Merge "Add additional owners" am: 1f92759998 am: e02f396584 am: 7a7f6fdbc9Philip P. Moltmann
am: 8b007e3d81 Change-Id: Ibcae42387bb412f99f0e73258f4d2425f4b0d48e
2019-08-19Merge "Add additional owners" am: 1f92759998 am: e02f396584Philip P. Moltmann
am: 7a7f6fdbc9 Change-Id: I19c353cf73c4202b8dfa0b8c1227d3cb723d0098
2019-08-19Merge "Add additional owners" am: 1f92759998Philip P. Moltmann
am: e02f396584 Change-Id: Ia275cd1c302c737477abe25547e5597a4e48de3c
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 21:39:45 +0000