summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-12.0.0_r112android-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-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-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_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-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-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseaml_tz2_305400100Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: da6adac8cf am: afb3ff1954 -s ours am skip reason: subject contains skip directive Change-Id: I05125aacc0e73aa8dff4bbf32f4c731a4eda7157
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: da6adac8cf Change-Id: I682637551ad4b4be00b3f4e076c961dc583e9e0b
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I5dfdf08e44dfbdcf3b98af277617fd443422ccc7
2019-10-02Remove libhwbinder/libhidltransport deps am: 845067f882 am: 4afe9ca36a am: ↵Steven Moreland
0446f1ee12 am: 59150ebbb8 Change-Id: Idfc648f746b9afb316ac26c8019eb9499bb7dc1b
2019-10-02Remove libhwbinder/libhidltransport deps am: 845067f882 am: 4afe9ca36aSteven Moreland
am: 0446f1ee12 Change-Id: I364692a09936c03879b469ebb858afeb32ca909e
2019-10-02Remove libhwbinder/libhidltransport deps am: 845067f882Steven Moreland
am: 4afe9ca36a Change-Id: I1e4e958296e0b2fa2907ee4579a67001675a574d
2019-10-02Remove libhwbinder/libhidltransport depsSteven Moreland
am: 845067f882 Change-Id: Idda1d10180786e7c53cdbbc4d69237a3785cbbd4
2019-10-01Remove libhwbinder/libhidltransport depsndk-sysroot-r21Steven Moreland
Since these were combined into libhidlbase. Bug: 135686713 Test: build only (libhwbinder/libhidltransport are empty) Change-Id: Ifd30bdc3f883b35d5c44fa3237d8adc73b281c76
2019-04-29Disable -Wimplicit-fallthrough unless src is fixed. am: 9d0da0f0a7 am: ↵Chih-Hung Hsieh
f7b1189fef am: a3faccfc31 Change-Id: I9b575443955661cb6d299d9b079d59bd691fca0e
2019-04-29Disable -Wimplicit-fallthrough unless src is fixed. am: 9d0da0f0a7Chih-Hung Hsieh
am: f7b1189fef Change-Id: I100a544f3587d9f83e299f1716416c9df432b865
2019-04-29Disable -Wimplicit-fallthrough unless src is fixed.android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Chih-Hung Hsieh
am: 9d0da0f0a7 Change-Id: Ibb46cb2129b11b25fd98465438435c849242bfe3
2019-04-24Disable -Wimplicit-fallthrough unless src is fixed.android-o-mr1-iot-release-1.0.12oreo-mr1-iot-releaseChih-Hung Hsieh
* Current -Wno-error=implicit-fallthrough caused clang-tidy assertion fault, see https://bugs.llvm.org/show_bug.cgi?id=39312 * We could enable this warning when source file is fixed. Bug: 117780134 Test: build with WITH_TIDY=1 Change-Id: I5e2c4b01dc11299e136b81f4ee3d817aa04c71cb
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: b52607f1a1 -s ours am skip reason: subject contains skip directive Change-Id: If7429831dbe28d7b995f8509449897d4f926be39
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I92beebd26ed0a0697904cc7b984464b2ef28e6f9
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: a954a76211 -s ours am: 16df9a553f -s ours am: 156e71dc2a -s ours Change-Id: I235eb73e609c3b475c73e81888cd819ee454e076
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: a954a76211 -s ours am: 16df9a553f -s ours Change-Id: I03abe1e3669bd3a2e923e7a5a7cacd2f8da59004
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: a954a76211 -s ours Change-Id: I916494f1a33c4804bc32c3c42d4853ae98ac359f
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.10Bill Yi
Change-Id: I36cc2b4e1bb69cce138e85f6d096f664d26d85a2
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 0af640cac8 -s ours am: 7e785e2a3a -s ours Change-Id: I9a34533e0e112f4254f87c287534e298403775c3
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 0af640cac8 -s ours Change-Id: Ica575e144ffef6a07619ea3fc346e35c29c13954
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I0f96f8e914ef300f8e3e50b60a52efa9583404a5
2018-10-19Allow implicit-fallthrough warnings locally. am: 7f4b26c7eb am: d2e19a8937Chih-Hung Hsieh
am: ba97239b07 Change-Id: I371b50fca2c1b9b1cf3e00760da0eae68aa2bba9
2018-10-19Allow implicit-fallthrough warnings locally. am: 7f4b26c7ebChih-Hung Hsieh
am: d2e19a8937 Change-Id: I5e2cc6900416585fbbb25c71fdb035f43f9e0e30
2018-10-19Allow implicit-fallthrough warnings locally.Chih-Hung Hsieh
am: 7f4b26c7eb Change-Id: I26c50fef34026736cc30557dc1dde01fd0a28a14
2018-10-19Allow implicit-fallthrough warnings locally.Chih-Hung Hsieh
It will be a global error by default. Test: make checkbuild Bug: 112564944 Change-Id: I1f3dd66f2c4d60ef4d7137b6e8b26fa61e9660a9 Exempt-From-Owner-Approval: do not block on new warnings
2018-09-14Merge "ipacm: Remove verbose cflag" am: 395152b03e am: c522e9ba52Luca Stefani
am: c3adf82a9a Change-Id: Iaed05b1213db55c4ecab451e95854feede6483d5
2018-09-14Merge "ipacm: Remove verbose cflag" am: 395152b03eLuca Stefani
am: c522e9ba52 Change-Id: I08e3db8ce9ff8571b65b6b145c1724f55841bfca
2018-09-14Merge "ipacm: Remove verbose cflag"Luca Stefani
am: 395152b03e Change-Id: I27fc767f7f5507726d9e15ed76d2800c319bf91c
2018-09-15Merge "ipacm: Remove verbose cflag"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseTreehugger Robot
2018-08-08Merge Android Pie into master am: eb2a1bb9f3 am: 2dd2cfad1a am: fdf4762cbcXin Li
am: 85b2efe85f Change-Id: Id9ecf669e6bde35da77ac5103d8f93cac1ae5a24
2018-08-07Merge Android Pie into master am: eb2a1bb9f3 am: 2dd2cfad1aXin Li
am: fdf4762cbc Change-Id: I06f1a21582bcdc812684198671a9e9abb22eb7ae
2018-08-07Merge Android Pie into master am: eb2a1bb9f3Xin Li
am: 2dd2cfad1a Change-Id: I4a03ded51d4d0895e91cd038b0f9a55b0ca21e95
2018-08-07Merge Android Pie into masterXin Li
am: eb2a1bb9f3 Change-Id: I7af93cb88a0a4177e05b4af0a615a4c37bd1cb30
2018-08-06Merge Android Pie into masterandroid-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3Xin Li
Bug: 112104996 Change-Id: Ic3da8ef7ac192f4b4c5568b99b0e6cfe6c6e84be
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: e945a414faXin Li
am: df6e5d5871 Change-Id: I2e6660414f672d37f626b4972c2426f670a73bf8
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
am: e945a414fa Change-Id: I51c2f726be0ca0378d21c2ea14b018871c279113
2018-06-08Merge pi-dev-plus-aosp-without-vendor into stage-aosp-mastertemp_p_mergeXin Li
Bug: 79597307 Change-Id: I45489eff1527f680a5822b147469c30a409261df
2018-05-20Snap for 4793185 from 0baec72ee58ed4ce18c00b094ea85726d264707d to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot
Change-Id: I7750f429d021d237b7b9d1120edbb77e2625f060
2018-05-18TetherOffload: Address VTS failure in AdditionalStopsWithInitReturnFalse am: ↵ssaha
0baec72ee5 am: 97f14db35c Change-Id: If579b84032d31c3fff7c56334ee0e1f2ae74cb2d
2018-05-18TetherOffload: Address VTS failure in AdditionalStopsWithInitReturnFalsessaha
am: 0baec72ee5 Change-Id: I73aabfcc325085feb1191de148978f1b1e006c40
2018-05-18TetherOffload: Address VTS failure in AdditionalStopsWithInitReturnFalseandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devssaha
- Currently if NAT iface is not added, IPACM cache setupstream events but default gw index will be set only after adding NAT iface. If IPACM receives stopOffload in between, then it is returning input check error to framework. Add check and clear event cache in case of stopOffload. - Fixed variable shadowing issue in HAL. Test: - build and boot - pass - VtsHalTetheroffloadControlV1_0TargetTest - pass - VTS Test AdditionalStopsWithInitReturnFalse - pass Change-Id: I335b7834c9a7567bc5bc05f683ec789b39c1efac Crs-fixed: 2228293 bug: 77996655 (cherry picked from commit b8c3d7ae84541f40c7b82e6c32ea1915ad4b1766)
2018-01-22merge in pi-release history after reset to mastergitbuildkicker
2018-01-22merge in pi-release history after reset to mastergitbuildkicker
2018-01-21Snap for 4557233 from 8a33ca28a70cf7f9594553ad2342c997b9a0a4b1 to pi-releaseandroid-build-team Robot
Change-Id: I07e8ee8460860c56c8843de2a7d07216e1aac922
2018-01-17Fix null ptr dereference and bad memory access.Steven Moreland
Bug: 62799790 Test: vts_ibase_test Change-Id: I067bee0cfe626144f78d1aa78156a6e5e56853da
2017-12-23ipacm: Remove verbose cflagLuca Stefani
* -v adds verbose info about toolchain and build command Change-Id: I7d028b4b606f209bd6c27f9f74f4fc04ff69d8c7
2017-12-14Snap for 4502278 from b5145a4ef609a462a48e05640d0998271f48edf6 to pi-releaseandroid-build-team Robot
Change-Id: I9cdc0dd3e4aff25180292b8e011a5370f5b8ec3b
2017-12-13IPACM: fix the ipacm crash issue on SSRSunmeet Gill
On SSR scenario without tethering enable once, ipacm crash due to uninitialized pointer, elrInstance. Make the change to initialize it as NULL Test: Verified force modem SSR and ipacm didn't crash Verified basic data and tethering use cases Bug: 67019241 CRs-Fixed: 2132095 Change-Id: I126f44c02a8b186dd2e61392cb2d9732263165e1
2017-12-11Snap for 4496165 from fbc8aaa3bf56d3be40d12bb4cf97540bc9dc6697 to pi-releaseandroid-build-team Robot
Change-Id: I9cf673942851609a582bd2f1c8bd86ad21a2a00d
2017-12-07Manually merge changes from giant AOSP topicStephen Li
Change-Id: I37a99096193c1455e70e9582d8a75a5b6f59615d
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 09:34:59 +0000