summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-21Snap for 7478028 from 3c5cf0bebd44055642a4d0ed34f45cb7434e3e85 to ↵android-mainline-12.0.0_r97android-mainline-12.0.0_r85android-mainline-12.0.0_r68android-mainline-12.0.0_r41android-mainline-12.0.0_r21android-mainline-12.0.0_r1android12-mainline-adbd-releaseandroid-build-team Robot
mainline-adbd-release Change-Id: I22f15dc7524f6c1c1f3ea74d0d65bf1012687b87
2021-06-07Merge "pppd: Move PLUGIN flag to defaults" into sc-dev am: 21f30887efandroid-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseTreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ppp/+/14717476 Change-Id: Ic4c64f1f8aca65b09effadfebba5a89107c654e7
2021-06-07Merge "pppd: Move PLUGIN flag to defaults" into sc-devandroid-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devTreeHugger Robot
2021-06-02Enable Async MTE in pppd. am: f59b886328Evgenii Stepanov
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ppp/+/14793616 Change-Id: Ic7cb1405a3ae971a8b9d65213ca966dcfb55b0e2
2021-06-01Enable Async MTE in pppd.Evgenii Stepanov
This change enables Async mode ARM MTE in pppd on compatible hardware and has no effect otherwise. Bug: 181603044 Test: atest under system/netd/tests Change-Id: I0db618b127001349e5b0aa18e54aa7e0d2a6109f Merged-In: I0db618b127001349e5b0aa18e54aa7e0d2a6109f (cherry picked from commit 6767ebbbe7cf74eb956f9d1123768da394b0e604)
2021-05-26pppd: Move PLUGIN flag to defaultsTreehugger Robot
Move the PLUGIN flad to cc defaults so that the binary is compiled with the option enabled. Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/1706808 Bug: 188035820 Merged-In: Ic727eede2991bf1c8f798c74057be246551479db Change-Id: Ic727eede2991bf1c8f798c74057be246551479db
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/ppp" am: a66109ce89 am: ↵Bob Badour
900d123b62 am: 6db8342e07 am: 375c1d95c6 Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/1588521 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id0017757adf783a808694c8551ec3e0076f2280c
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/ppp" am: a66109ce89 am: ↵Bob Badour
900d123b62 am: 6db8342e07 Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/1588521 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icfa685b969924be770f6590da43c19b91b5430b0
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/ppp" am: a66109ce89 am: ↵Bob Badour
900d123b62 Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/1588521 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2d11b84eff52665cb7a957c1a8fbcc2e0b4ade43
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/ppp" am: a66109ce89android-s-beta-2android-s-beta-1Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/1588521 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I298be2620279e9fd0523188a6ae62e00fad1b750
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/ppp"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/pppBob Badour
Added SPDX-license-identifier-0BSD SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL SPDX-license-identifier-MIT legacy_notice legacy_unencumbered to: Android.bp pppd/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I1b4e849b547d46a1a1d00dd7e93ed1129c2bb8ec
2020-07-16Merge "Added static library target for pppd" am: 28eb3e4f83 am: dde1bdd633 ↵Max Spector
am: 19d2f0440d am: 1a2e2349d9 am: d4ccf727de Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/1349164 Change-Id: I9ef2af9ae7a6a689c096c074d73c1742efc19bfa
2020-07-16Merge "Added static library target for pppd" am: 28eb3e4f83 am: dde1bdd633 ↵Max Spector
am: 19d2f0440d am: 1a2e2349d9 Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/1349164 Change-Id: I16b8f9b98317edab6060c9b7e9a765b3a2b1fe99
2020-07-16Merge "Added static library target for pppd" am: 28eb3e4f83 am: dde1bdd633 ↵Max Spector
am: 19d2f0440d Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/1349164 Change-Id: I1ac77e3c8c840f4fd8d9a4e29e2cb5e6c3a7ae6f
2020-07-16Merge "Added static library target for pppd" am: 28eb3e4f83 am: dde1bdd633Max Spector
Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/1349164 Change-Id: I7772fed7185a4e3454e473afd021ec05dbabd8f9
2020-07-16Merge "Added static library target for pppd" am: 28eb3e4f83Max Spector
Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/1349164 Change-Id: I127bb2dc4dcc3ada1a0de17e04c81808be3a0f9a
2020-07-16Merge "Added static library target for pppd"Max Spector
2020-07-15Added static library target for pppdJasraj Bedi
Renamed main() in main.c to prevent conflicts with other targets that depend on it as a library Bug: 159832644 Test: Builds and run on device Change-Id: Id4d72eb391ed2895ac2973458dd0295b947930c4
2020-04-30Merge "Add METADATA to ppp: contains GPL=RESTRICTED" am: 875e4995a8 am: ↵Treehugger Robot
3d486b5dcd am: 8d27a16557 am: abef44ccc1 am: 27e39ee6b3 Change-Id: I5b8f183b07f4288262aaccb13b6b94c0ee529c07
2020-04-30Merge "Add METADATA to ppp: contains GPL=RESTRICTED" am: 875e4995a8 am: ↵Treehugger Robot
3d486b5dcd am: 8d27a16557 am: abef44ccc1 Change-Id: Ib64d48065a20aba5339df88f36e9274828a0a342
2020-04-30Merge "Add METADATA to ppp: contains GPL=RESTRICTED" am: 875e4995a8 am: ↵Treehugger Robot
3d486b5dcd am: 8d27a16557 Change-Id: I8d526a60b27fec1e00b89897b32601efe062ddd7
2020-04-30Merge "Add METADATA to ppp: contains GPL=RESTRICTED" am: 875e4995a8 am: ↵Treehugger Robot
3d486b5dcd Change-Id: I2da9eedbb2e4f341e84424601062999ab7f9b72c
2020-04-30Merge "Add METADATA to ppp: contains GPL=RESTRICTED" am: 875e4995a8Treehugger Robot
Change-Id: I49d1e48676d85827acbed169ce25f0f935b82737
2020-04-30Merge "Add METADATA to ppp: contains GPL=RESTRICTED"Treehugger Robot
2020-04-29Add METADATA to ppp: contains GPL=RESTRICTEDBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ie5ec71e4a0c030902b7bb78f41723dae5073ffe5
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 24c45a1092 -s ours am: fe088d8a7f am: 5a3ba6e74f am: b420d5212d -s ours am skip reason: subject contains skip directive Change-Id: I4e2851ff7df2551ce7f33b40e5240a703792666b
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 24c45a1092 -s ours am: fe088d8a7f am: 5a3ba6e74f Change-Id: I1d1db46c07a4403c52d265c9f6ea50123bab67c0
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 24c45a1092 -s ours am: fe088d8a7f Change-Id: Ieee0735431b04ea73113c9e204fafcf9505515c8
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 24c45a1092 -s ours am skip reason: subject contains skip directive Change-Id: I83e3d0a41e77c034a1c6c23c0b07542cf748bfbb
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I7d197af9f6140fcf78dc8c3c87e8f252e69bc247
2020-04-02[automerger skipped] pppd: Fix bounds check in EAP code am: f9fec5c369 am: ↵Paul Mackerras
0adf11c24c am: 5788de2192 am: 024dbd1dc3 am: 39855b1e5b am: 80896b9c49 am: fdffd0deaf am: 7bbd97dd7c am: e4712fc02b am: 5c642deb04 -s ours am: ce4eac2725 -s ours am skip reason: Change-Id Ibc29e1b5b17ddee256b1ff5f3e9909347403a791 with SHA-1 f9fec5c369 is in history Change-Id: Iead82d7703daaf03238cf194ab0b9d457067b7e3
2020-04-02[automerger skipped] pppd: Fix bounds check in EAP code am: f9fec5c369 am: ↵Paul Mackerras
0adf11c24c am: 5788de2192 am: 024dbd1dc3 am: 39855b1e5b am: 80896b9c49 am: fdffd0deaf -s ours am: 5869b4b87b -s ours am: b88db7a094 -s ours am: 1c4d556d34 -s ours am skip reason: Change-Id Ibc29e1b5b17ddee256b1ff5f3e9909347403a791 with SHA-1 f9fec5c369 is in history Change-Id: I1131a35cac656744c3a33db2822ab29a79590b12
2020-04-02[automerger skipped] pppd: Fix bounds check in EAP code am: f9fec5c369 am: ↵Paul Mackerras
0adf11c24c am: 5788de2192 am: 024dbd1dc3 am: 39855b1e5b am: 80896b9c49 am: fdffd0deaf am: 7bbd97dd7c -s ours am: d48b057e09 -s ours am: 2597b8a75f -s ours am skip reason: Change-Id Ibc29e1b5b17ddee256b1ff5f3e9909347403a791 with SHA-1 57816b20b3 is in history Change-Id: I9baf84825e44d7d4350bde4bd829ab7e4036931e
2020-04-02[automerger skipped] pppd: Fix bounds check in EAP code am: f9fec5c369 am: ↵Paul Mackerras
0adf11c24c am: 5788de2192 am: 024dbd1dc3 am: 39855b1e5b am: 80896b9c49 am: fdffd0deaf am: 7bbd97dd7c am: e4712fc02b am: 5c642deb04 -s ours am skip reason: Change-Id Ibc29e1b5b17ddee256b1ff5f3e9909347403a791 with SHA-1 f9fec5c369 is in history Change-Id: Ic3ab301ea65a73c818dd28cd21096140e1b6753e
2020-04-02[automerger skipped] pppd: Fix bounds check in EAP code am: f9fec5c369 am: ↵Paul Mackerras
0adf11c24c am: 5788de2192 am: 024dbd1dc3 am: 39855b1e5b am: 80896b9c49 am: fdffd0deaf -s ours am: 5869b4b87b -s ours am: b88db7a094 -s ours am skip reason: Change-Id Ibc29e1b5b17ddee256b1ff5f3e9909347403a791 with SHA-1 f9fec5c369 is in history Change-Id: I135a1753a3b31a7a5a99a2469e78f8413b475ea6
2020-04-02pppd: Fix bounds check in EAP code am: f9fec5c369 am: 0adf11c24c am: ↵Paul Mackerras
5788de2192 am: 024dbd1dc3 am: 39855b1e5b am: 80896b9c49 am: fdffd0deaf am: 7bbd97dd7c am: e4712fc02b Change-Id: If7b8e61fd56c097846e60ba0304753043e81ca00
2020-04-02[automerger skipped] pppd: Fix bounds check in EAP code am: f9fec5c369 am: ↵Paul Mackerras
0adf11c24c am: 5788de2192 am: 024dbd1dc3 am: 39855b1e5b am: 80896b9c49 am: fdffd0deaf am: 7bbd97dd7c -s ours am: d48b057e09 -s ours am skip reason: Change-Id Ibc29e1b5b17ddee256b1ff5f3e9909347403a791 with SHA-1 57816b20b3 is in history Change-Id: I158ec2c2e69b03a2c1b85ddc602f2af20cad5da7
2020-04-02[automerger skipped] pppd: Fix bounds check in EAP code am: f9fec5c369 am: ↵Paul Mackerras
0adf11c24c am: 5788de2192 am: 024dbd1dc3 am: 39855b1e5b am: 80896b9c49 am: fdffd0deaf -s ours am: 5869b4b87b -s ours am skip reason: Change-Id Ibc29e1b5b17ddee256b1ff5f3e9909347403a791 with SHA-1 f9fec5c369 is in history Change-Id: I5f7e167fd294edd332c35c454fc89c26805aff0d
2020-04-02[automerger skipped] pppd: Fix bounds check in EAP code am: f9fec5c369 am: ↵Paul Mackerras
0adf11c24c am: 5788de2192 am: 024dbd1dc3 am: 39855b1e5b am: 80896b9c49 am: fdffd0deaf am: 7bbd97dd7c -s ours am skip reason: Change-Id Ibc29e1b5b17ddee256b1ff5f3e9909347403a791 with SHA-1 57816b20b3 is in history Change-Id: I024dda8419bac72758b64342814fa38b358d49c9
2020-04-02pppd: Fix bounds check in EAP code am: f9fec5c369 am: 0adf11c24c am: ↵android-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_r18android11-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-d2-releasePaul Mackerras
5788de2192 am: 024dbd1dc3 am: 39855b1e5b am: 80896b9c49 am: fdffd0deaf am: 7bbd97dd7c Change-Id: I1fc6a925eb78a02501b0bf584453a9bc6d62e56c
2020-04-02[automerger skipped] pppd: Fix bounds check in EAP code am: f9fec5c369 am: ↵Paul Mackerras
0adf11c24c am: 5788de2192 am: 024dbd1dc3 am: 39855b1e5b am: 80896b9c49 am: fdffd0deaf -s ours am skip reason: Change-Id Ibc29e1b5b17ddee256b1ff5f3e9909347403a791 with SHA-1 57816b20b3 is in history Change-Id: I93b90e3357cfbc4272feb36fcb377024069dee37
2020-04-02pppd: Fix bounds check in EAP code am: f9fec5c369 am: 0adf11c24c am: ↵android-11.0.0_r16android11-d1-b-releasePaul Mackerras
5788de2192 am: 024dbd1dc3 am: 39855b1e5b am: 80896b9c49 am: fdffd0deaf Change-Id: I83effc719d9484718ffacb16a6e82499735f75c4
2020-04-02[automerger skipped] pppd: Fix bounds check in EAP code am: f9fec5c369 am: ↵Paul Mackerras
0adf11c24c am: 5788de2192 am: 024dbd1dc3 am: 39855b1e5b am: 80896b9c49 -s ours am skip reason: Change-Id Ibc29e1b5b17ddee256b1ff5f3e9909347403a791 with SHA-1 57816b20b3 is in history Change-Id: I0cd9190a02f83e4ea6710c27cda529b7c98c596e
2020-04-02pppd: Fix bounds check in EAP code am: f9fec5c369 am: 0adf11c24c am: ↵android-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_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_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-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_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_r12android11-mainline-tethering-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-devPaul Mackerras
5788de2192 am: 024dbd1dc3 am: 39855b1e5b am: 80896b9c49 Change-Id: If63c2ba565822f4d02335bc9ed306a2453946e83
2020-04-02pppd: Fix bounds check in EAP code am: f9fec5c369 am: 0adf11c24c am: ↵Paul Mackerras
5788de2192 am: 024dbd1dc3 am: 39855b1e5b Change-Id: I1d294ff32a728f4dca2da3ba0164d84f7546e995
2020-04-02pppd: Fix bounds check in EAP code am: f9fec5c369 am: 0adf11c24c am: ↵Paul Mackerras
5788de2192 am: 024dbd1dc3 Change-Id: I0d8404ab0b7d555cd4d4ff4c314305aa90523e2e
2020-04-02pppd: Fix bounds check in EAP code am: f9fec5c369 am: 0adf11c24c am: 5788de2192Paul Mackerras
Change-Id: I56f55d6da94a31388c8a6b5aa2f6174c604dd55e
2020-04-01pppd: Fix bounds check in EAP code am: f9fec5c369 am: 0adf11c24cPaul Mackerras
Change-Id: I6c5cee72923ce0bb45a87dd4b4f2abf19f12fb58
2020-04-01pppd: Fix bounds check in EAP code am: f9fec5c369Paul Mackerras
Change-Id: Ia918dbb574a1b4d560f04c056554b7dd1514b015