summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-02Enable Async MTE in mtpd. am: 09ecab8acaandroid-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseEvgenii Stepanov
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mtpd/+/14793304 Change-Id: I22101720ebbef0a1a95a1a13a496a5842de1c766
2021-06-01Enable Async MTE in mtpd.android-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-devEvgenii Stepanov
This change enables Async mode ARM MTE in mtpd on compatible hardware and has no effect otherwise. Bug: 181603044 Test: atest under system/netd/tests Change-Id: I4405d2bc1254fc65ff044a878ac1abd99f7ffc89 Merged-In: I4405d2bc1254fc65ff044a878ac1abd99f7ffc89 (cherry picked from commit e4ca2c43fe67150c400afeeb7bf3b4c6ea95f880)
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mtpd" am: 2c7cca207c am: ↵Bob Badour
a3eea271bb am: 2b2f1ebae8 Original change: https://android-review.googlesource.com/c/platform/external/mtpd/+/1588898 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia26b48b4039ea3f10a0d1ec93a1b97bf376e785b
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mtpd" am: 2c7cca207c am: ↵Bob Badour
a3eea271bb Original change: https://android-review.googlesource.com/c/platform/external/mtpd/+/1588898 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I87f77fcbcfc3d64ea3b0c69ea148360e51960d37
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mtpd" am: 2c7cca207candroid-s-beta-2android-s-beta-1Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/mtpd/+/1588898 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id5e3a6b86f55e6883ee50cda3d6bd1d24f517fbf
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mtpd"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/mtpdBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I940e99a61a5b32b8ddde220fa36f7cde12123858
2020-04-29Merge "Add METADATA to mtpd: Apache2=NOTICE" am: c1d42e2bde am: e32bc00d9b ↵Treehugger Robot
am: 02856a9f67 am: 58fefd8f85 am: e6a17ff0ce Change-Id: Ib784dd3e2166de16140a8e2fb37fb7a8fcf0f848
2020-04-29Merge "Add METADATA to mtpd: Apache2=NOTICE" am: c1d42e2bde am: e32bc00d9b ↵Treehugger Robot
am: 02856a9f67 am: 58fefd8f85 Change-Id: I3cfecbf3b2deb0708102248254e33e15b046079a
2020-04-29Merge "Add METADATA to mtpd: Apache2=NOTICE" am: c1d42e2bde am: e32bc00d9b ↵Treehugger Robot
am: 02856a9f67 Change-Id: Id470a155c28aeabc88b43cd7c5d95f1251e9320c
2020-04-29Merge "Add METADATA to mtpd: Apache2=NOTICE" am: c1d42e2bde am: e32bc00d9bTreehugger Robot
Change-Id: I69cbdb11f4bd5abe6c81286e3c77e670acbdfc38
2020-04-29Merge "Add METADATA to mtpd: Apache2=NOTICE" am: c1d42e2bdeandroid-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I28c5f2cdcbe0ecdbd7bb6b19fe7e24a67080bb78
2020-04-29Merge "Add METADATA to mtpd: Apache2=NOTICE"Treehugger Robot
2020-04-28Add METADATA to mtpd: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ib502a4f946a961a130197e8617a0e4391f2d2be8
2019-10-16Skip QD1A.190821.011 in stage-aosp-master am: d7faaf63dc am: 83bd1754f3r_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-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_r10android11-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-releaseXin Li
am: 106b0e350a Change-Id: I505fe1176b5d4c63bbff110ccd5dc8c43b31694f
2019-10-16Skip QD1A.190821.011 in stage-aosp-master am: d7faaf63dcq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-r-preview-4android-r-preview-3android-r-preview-2android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r8android-mainline-10.0.0_r6android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-android13-mainline-tzdata-releaseXin Li
am: 83bd1754f3 Change-Id: I9236de96ebe98156d5e9c1295bbef9745ff9ab7d
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterXin Li
am: d7faaf63dc Change-Id: I238e7659d3da2723865a409f65f0775361cae79d
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterandroid-r-preview-1Xin Li
Bug: 141248619 Change-Id: I6c77fbc2757140bbb7d144be09c10711ac9970d6
2019-05-30Snap for 5616560 from ca7860c5d1284f84e77ad850441b8bb00d1f4625 to ↵android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid-build-team Robot
qt-c2f2-release Change-Id: Ic81ae663759eed795b0fe256cb241bd391625310
2019-05-28Merge "[automerger skipped] Try OPNS/OLAC before PPTP/L2TP am: a378c558d6 ↵Alistair Strachan
am: ca7860c5d1 -s ours am: 8c3910aa89 -s ours am skip reason: change_id Ic64426c76135b717a1da7013bc03501c03d19a6b with SHA1 d799900e7b is in history Change-Id: I55a193dcf2e40c653d67b30091f8167f81d7e8a1
2019-05-28[automerger skipped] Try OPNS/OLAC before PPTP/L2TP am: a378c558d6 -s ours ↵Alistair Strachan
am: b4b0bd6e43 -s ours am: 11150b23b4 -s ours am skip reason: change_id Ic64426c76135b717a1da7013bc03501c03d19a6b with SHA1 d799900e7b is in history Change-Id: I80f0f11a97fd022fddc2164cc66c40b938d6437a
2019-05-29Merge "[automerger skipped] Try OPNS/OLAC before PPTP/L2TP am: a378c558d6 ↵Android Build Merger (Role)
am: ca7860c5d1 -s ours am skip reason: change_id Ic64426c76135b717a1da7013bc03501c03d19a6b with SHA1 d799900e7b is in history" into qt-r1-dev-plus-aosp
2019-05-28[automerger skipped] Try OPNS/OLAC before PPTP/L2TP am: a378c558d6 -s oursAlistair Strachan
am: b4b0bd6e43 -s ours am skip reason: change_id Ic64426c76135b717a1da7013bc03501c03d19a6b with SHA1 d799900e7b is in history Change-Id: Iccbcea349daa16b5eea88733a72fd0c0952a839c
2019-05-28[automerger skipped] Try OPNS/OLAC before PPTP/L2TP am: a378c558d6Alistair Strachan
am: ca7860c5d1 -s ours am skip reason: change_id Ic64426c76135b717a1da7013bc03501c03d19a6b with SHA1 d799900e7b is in history Change-Id: Id2edff424477b7d702ff1cf9a916ca886dbfc415
2019-05-28Try OPNS/OLAC before PPTP/L2TPandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-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_r30android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-d4-s1-releaseandroid10-d4-releaseAlistair Strachan
am: a378c558d6 Change-Id: I6424dfadcd77874edd1095066b1ec612b32eeea1
2019-05-28[automerger skipped] Try OPNS/OLAC before PPTP/L2TPndk-sysroot-r21Alistair Strachan
am: a378c558d6 -s ours am skip reason: change_id Ic64426c76135b717a1da7013bc03501c03d19a6b with SHA1 d799900e7b is in history Change-Id: Iff378e03bc77456d848c051c92db0c8346ca30be
2019-05-29Try OPNS/OLAC before PPTP/L2TPandroid10-devAlistair Strachan
When the PPTP/L2TP path was introduced, support for the features was determined simply by opening a socket with the appropriate upstream socket protocol types. However, it was later found that older kernels had bugs in their PPTP implementation which silently broke Android's use of the ppp tunnel, and must not be used. Unfortunately, some devices ship with CONFIG_PPTP or CONFIG_L2TP enabled *in addition* to the CONFIG_PPPOPNS or CONFIG_PPPOLAC Android extensions, but lacked the upstream fixes to PPTP/L2TP. This meant that mtpd would prefer the broken PPTP/L2TP features over the working OPNS/OLAC features. On newer kernels, which do not have broken PPTP/L2TP implementations, we have explicitly removed the Android OPNS/OLAC changes. This means even if we "prefer" the deprecated method, it will never be used, and PPTP/L2TP will always be used instead, which is what we want. This change maximizes compatibility with older broken kernels without sacrificing use of the modern path on kernels without the bugs. Bug: 116424816 Change-Id: Ic64426c76135b717a1da7013bc03501c03d19a6b Merged-In: Ic64426c76135b717a1da7013bc03501c03d19a6b (cherry picked from commit 1b5fc73ae98d5e3b7d2c1f10d9dcbc2749355d3e)
2019-05-28Merge "Try OPNS/OLAC before PPTP/L2TP" am: 7ea34f7213 am: c956cf9485 am: ↵Alistair Strachan
1b5fc73ae9 am: fa917291a8 Change-Id: I72ac34d9fc6d585748f5e185c4cd035d9286ef8c
2019-05-28Merge "Try OPNS/OLAC before PPTP/L2TP" am: 7ea34f7213 am: c956cf9485Alistair Strachan
am: 1b5fc73ae9 Change-Id: I71bcf23d12c1a3dfbc2860a68dcd70764d38d813
2019-05-28Merge "Try OPNS/OLAC before PPTP/L2TP" am: 7ea34f7213Alistair Strachan
am: c956cf9485 Change-Id: I369894754eb51e02690b75ef4cf0aba29cedc8a5
2019-05-28Merge "Try OPNS/OLAC before PPTP/L2TP"Alistair Strachan
am: 7ea34f7213 Change-Id: I598c09dbb46146c07e1703b0fccf85ed21b31ecb
2019-05-28Merge "Try OPNS/OLAC before PPTP/L2TP"android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Treehugger Robot
2019-05-28Try OPNS/OLAC before PPTP/L2TPAlistair Strachan
When the PPTP/L2TP path was introduced, support for the features was determined simply by opening a socket with the appropriate upstream socket protocol types. However, it was later found that older kernels had bugs in their PPTP implementation which silently broke Android's use of the ppp tunnel, and must not be used. Unfortunately, some devices ship with CONFIG_PPTP or CONFIG_L2TP enabled *in addition* to the CONFIG_PPPOPNS or CONFIG_PPPOLAC Android extensions, but lacked the upstream fixes to PPTP/L2TP. This meant that mtpd would prefer the broken PPTP/L2TP features over the working OPNS/OLAC features. On newer kernels, which do not have broken PPTP/L2TP implementations, we have explicitly removed the Android OPNS/OLAC changes. This means even if we "prefer" the deprecated method, it will never be used, and PPTP/L2TP will always be used instead, which is what we want. This change maximizes compatibility with older broken kernels without sacrificing use of the modern path on kernels without the bugs. Bug: 116424816 Change-Id: Ic64426c76135b717a1da7013bc03501c03d19a6b
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
am: 35b772680e Change-Id: Ic8eac481c754f991572b2cae45a47aa25f6a7b3a
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I2f0005421594e2419984500b4abf2bd87b0d26b3
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I4679c3ee7b6f933b6c242aa4593789fafc5c477b
2019-01-17Merge "Add default code reviewers into OWNERS" am: ad39bdda13 am: 2634344329Chih-hung Hsieh
am: 3828f265bc Change-Id: I8f35f66a1029d79137a834e95a7f454c70c2eabe
2019-01-17Merge "Add default code reviewers into OWNERS" am: ad39bdda13Chih-hung Hsieh
am: 2634344329 Change-Id: If44deb850ea8570aa547357aab3dee0307100358
2019-01-17Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
am: ad39bdda13 Change-Id: Ic20ba6f287f2e6a415c87ceb9d3b4b6c992dcadc
2019-01-17Merge "Add default code reviewers into OWNERS"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseChih-hung Hsieh
2019-01-11Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: Ibf76f17d63346773322ed922bd7b5c9cc5017594
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 4b307d4c44 -s ours am: 183f9638d5 -s ours am: 3fff5caba8 -s ours Change-Id: I128714c3c9750ee9fd1ac7499f870ac72e269a3e
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 4b307d4c44 -s ours am: 183f9638d5 -s ours Change-Id: I4829e4069babf40683d0e09a315c35fdc3bc7881
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 4b307d4c44 -s ours Change-Id: I971a86d8a4c5b5de904003a3e5e90af2a80b0ecc
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-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-n-iot-release-ihome-igv1nougat-iot-releaseBill Yi
Change-Id: Iebd3beb4a77cb91342c2b2c4a592c9036970a3d5
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: e162f429da -s ours am: 87bbf0ca6e -s ours Change-Id: I1a8b13bc879b56a6794a31845ed141d8818f0f80
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: e162f429da -s ours Change-Id: Id01273b122e879462b1432e7a2cb09a208c9722d
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: Ia5bcd81de89ed915b22f3e3836340a65c1511433
2018-08-30Merge changes from topic "pppopns" am: 9f0bd306a9 am: c6bf61f0e0Alistair Strachan
am: 1ffa915af2 Change-Id: Iebd04008b3a1149c5c03ee96b9c1df1a6286da1f
2018-08-30Merge changes from topic "pppopns" am: 9f0bd306a9Alistair Strachan
am: c6bf61f0e0 Change-Id: I8123c4c37aa9ad161150135e13b5a4d29655052e
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 00:53:36 +0000