summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I85603beec48195eb83f84f411fbab03c8fb604b1 Change-Id: I36b8378d6bd4affb78b81a81aadbfa5736de1813
2020-09-10Merge "Update language to comply with Android’s inclusive language ↵Bruce Chen
guidance" am: c8402de362 am: b6ff4a2999 am: e0a397967e am: d974302860 am: 9d315db991 Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1418829 Change-Id: I8d148b7e3a9311e8516755d060396e840bf8f2c5
2020-09-10Merge "Update language to comply with Android’s inclusive language ↵Bruce Chen
guidance" am: c8402de362 am: b6ff4a2999 am: e0a397967e am: d974302860 Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1418829 Change-Id: I32d19d6426ad1f96686aa34b3a491e65888f3b88
2020-09-10Merge "Update language to comply with Android’s inclusive language ↵Bruce Chen
guidance" am: c8402de362 am: b6ff4a2999 am: e0a397967e Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1418829 Change-Id: I494a9155e923ffb2b4a21b7199a78378b81e7cfc
2020-09-10Merge "Update language to comply with Android’s inclusive language ↵Bruce Chen
guidance" am: c8402de362 am: b6ff4a2999 Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1418829 Change-Id: I2f91025270d8c4fb6143bc7dd8b2a4975a541035
2020-09-10Merge "Update language to comply with Android’s inclusive language ↵Bruce Chen
guidance" am: c8402de362 Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1418829 Change-Id: I2a327f1d5be77c4b58857922c648ffa01ddf3782
2020-09-10Merge "Update language to comply with Android’s inclusive language guidance"Bruce Chen
2020-09-09Update language to comply with Android’s inclusive language guidancechenbruce
See https://source.android.com/setup/contribute/respectful-code for reference inclusivefixit Bug: 166529523 Test: m Change-Id: Ib436cde848335813528f49207dee88a92a128929
2020-04-29Merge "Add METADATA to dnsmasq: GPL=RESTRICTED" am: 89d3389d8a am: ↵Treehugger Robot
b4504cce43 am: c783822b83 am: b88cf99c05 am: ee072b6de2 Change-Id: I1c9e72bb0606ce58bcc4d77a231d6041edf42942
2020-04-29Merge "Add METADATA to dnsmasq: GPL=RESTRICTED" am: 89d3389d8a am: ↵Treehugger Robot
b4504cce43 am: c783822b83 am: b88cf99c05 Change-Id: If36f2b3ef7125a6e32bb49107308c63d62932514
2020-04-29Merge "Add METADATA to dnsmasq: GPL=RESTRICTED" am: 89d3389d8a am: ↵Treehugger Robot
b4504cce43 am: c783822b83 Change-Id: I85603beec48195eb83f84f411fbab03c8fb604b1
2020-04-29Merge "Add METADATA to dnsmasq: GPL=RESTRICTED" am: 89d3389d8a am: b4504cce43Treehugger Robot
Change-Id: I61e6ab2aeffce4ee835fd3bd6247b96ced7f9e39
2020-04-29Merge "Add METADATA to dnsmasq: GPL=RESTRICTED" am: 89d3389d8aandroid-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: If85881f9aab7b3ac7e710f21e2f8b9b81639a791
2020-04-28Merge "Add METADATA to dnsmasq: GPL=RESTRICTED"Treehugger Robot
2020-04-28Add METADATA to dnsmasq: GPL=RESTRICTEDBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I891f3b85c9aa6f7e923c9ab5ba0a21f474aa4178
2020-04-16[automerger skipped] Don't enumerate interfaces if no interfaces were found. ↵Lorenzo Colitti
am: 7b753522c0 am: 1c79886d80 am: a5bc19e1f5 am: 260b91005f -s ours am: 345a56f7c1 -s ours am skip reason: Change-Id Id9289e5a22dddceb53782d75e3caa4f6a88c6fb1 with SHA-1 7b753522c0 is in history Change-Id: Ic77c750b99467f4527f3decdc0b5a11b55c896c3
2020-04-16[automerger skipped] Don't enumerate interfaces if no interfaces were found. ↵Lorenzo Colitti
am: 7b753522c0 -s ours am: 9e483944c1 -s ours am: a6aed23f63 -s ours am: a06ca7f307 -s ours am skip reason: Change-Id Id9289e5a22dddceb53782d75e3caa4f6a88c6fb1 with SHA-1 7b753522c0 is in history Change-Id: I062ccd29ca686dce4bf63729279d02c3ce29ba70
2020-04-16[automerger skipped] Don't enumerate interfaces if no interfaces were found. ↵Lorenzo Colitti
am: 7b753522c0 am: 1c79886d80 -s ours am: da3f1e8d5a -s ours am: 463e819d1a -s ours am skip reason: Change-Id Id9289e5a22dddceb53782d75e3caa4f6a88c6fb1 with SHA-1 c37a28e59f is in history Change-Id: I1fdd50eca7f3dab900a4b6eede2998cefc595900
2020-04-16[automerger skipped] Don't enumerate interfaces if no interfaces were found. ↵Lorenzo Colitti
am: 7b753522c0 am: 1c79886d80 am: a5bc19e1f5 am: 260b91005f -s ours am skip reason: Change-Id Id9289e5a22dddceb53782d75e3caa4f6a88c6fb1 with SHA-1 7b753522c0 is in history Change-Id: I521b1bd3353a38e15ae3cef1ea0f6fbbcf1d9638
2020-04-16[automerger skipped] Don't enumerate interfaces if no interfaces were found. ↵Lorenzo Colitti
am: 7b753522c0 -s ours am: 9e483944c1 -s ours am: a6aed23f63 -s ours am skip reason: Change-Id Id9289e5a22dddceb53782d75e3caa4f6a88c6fb1 with SHA-1 7b753522c0 is in history Change-Id: Ie491b1bff6a85e759a915b7fc015f01d9d77a341
2020-04-16[automerger skipped] Don't enumerate interfaces if no interfaces were found. ↵Lorenzo Colitti
am: 7b753522c0 am: 1c79886d80 -s ours am: da3f1e8d5a -s ours am skip reason: Change-Id Id9289e5a22dddceb53782d75e3caa4f6a88c6fb1 with SHA-1 c37a28e59f is in history Change-Id: I628a5e07c8b02755b82b3a8708b14d241c97850e
2020-04-16Don't enumerate interfaces if no interfaces were found. am: 7b753522c0 am: ↵Lorenzo Colitti
1c79886d80 am: a5bc19e1f5 Change-Id: Ib77d05a231675fae92e31f34598fee52c20b1ae0
2020-04-16[automerger skipped] Don't enumerate interfaces if no interfaces were found. ↵Lorenzo Colitti
am: 7b753522c0 -s ours am: 9e483944c1 -s ours am skip reason: Change-Id Id9289e5a22dddceb53782d75e3caa4f6a88c6fb1 with SHA-1 7b753522c0 is in history Change-Id: I43fb1965367656986406cbfbc78b7a298a38cabc
2020-04-16[automerger skipped] Don't enumerate interfaces if no interfaces were found. ↵Lorenzo Colitti
am: 7b753522c0 am: 1c79886d80 -s ours am skip reason: Change-Id Id9289e5a22dddceb53782d75e3caa4f6a88c6fb1 with SHA-1 c37a28e59f is in history Change-Id: Ifb4018f43cfd45f2e37ca93aa8050ada18cc0115
2020-04-16Don't enumerate interfaces if no interfaces were found. am: 7b753522c0 am: ↵android-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-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseLorenzo Colitti
1c79886d80 Change-Id: I0f7dda6c8571e07130eb5846660f9a30637c3cba
2020-04-16[automerger skipped] Don't enumerate interfaces if no interfaces were found. ↵Lorenzo Colitti
am: 7b753522c0 -s ours am skip reason: Change-Id Id9289e5a22dddceb53782d75e3caa4f6a88c6fb1 with SHA-1 c37a28e59f is in history Change-Id: I82f8a30631fa9c10170ba197c6093381f515bea8
2020-04-16Don't enumerate interfaces if no interfaces were found. am: 7b753522c0android-11.0.0_r16android11-d1-b-releaseLorenzo Colitti
Change-Id: I72e97505e1dd78e84f27035041ea5e321bc31f57
2020-04-16Don't enumerate interfaces if no interfaces were found.android-mainline-11.0.0_r35android11-devLorenzo Colitti
When dnsmasq receives a list of interfaces, but cannot find any of them (e.g., because they have all been deleted), it enters the default non-Android codepath where it listens on all interfaces. Then, if any of the interfaces on the system is deleted while it is starting up on all interfaces, it can enter a codepath where it gets stuck for 20(!) seconds for DAD to complete on an interface that no longer exists. Bug: 152695206 Test: new test coverage in netd_integration_test Merged-In: Id9289e5a22dddceb53782d75e3caa4f6a88c6fb1 Change-Id: Id9289e5a22dddceb53782d75e3caa4f6a88c6fb1
2020-04-15Merge "Don't enumerate interfaces if no interfaces were found." am: ↵Lorenzo Colitti
ae3d675a71 am: ed507c4c5f am: 10f222d49c am: b898d91142 am: 7d4e23f042 Change-Id: I576147f7a3ba21c7e29660700c660ad1a0af8ca7
2020-04-15Merge "Don't enumerate interfaces if no interfaces were found." am: ↵Lorenzo Colitti
ae3d675a71 am: ed507c4c5f am: 10f222d49c am: b898d91142 Change-Id: Ib4fc7206747bb39bff55c18fc35c251457b730a5
2020-04-15Merge "Don't enumerate interfaces if no interfaces were found." am: ↵Lorenzo Colitti
ae3d675a71 am: ed507c4c5f am: 10f222d49c Change-Id: I3a9c396ab9527ac24671166375f85d18c2ada36d
2020-04-15Merge "Don't enumerate interfaces if no interfaces were found." am: ↵Lorenzo Colitti
ae3d675a71 am: ed507c4c5f Change-Id: I3186129cb55d3dde068023a4ecd4c1d58aba996f
2020-04-15Merge "Don't enumerate interfaces if no interfaces were found." am: ae3d675a71Lorenzo Colitti
Change-Id: I59af144182b3d6aa8705551c1a3cda108b575dfe
2020-04-15Merge "Don't enumerate interfaces if no interfaces were found."Lorenzo Colitti
2020-04-06Don't enumerate interfaces if no interfaces were found.Lorenzo Colitti
When dnsmasq receives a list of interfaces, but cannot find any of them (e.g., because they have all been deleted), it enters the default non-Android codepath where it listens on all interfaces. Then, if any of the interfaces on the system is deleted while it is starting up on all interfaces, it can enter a codepath where it gets stuck for 20(!) seconds for DAD to complete on an interface that no longer exists. Bug: 152695206 Test: new test coverage in netd_integration_test Change-Id: Id9289e5a22dddceb53782d75e3caa4f6a88c6fb1
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospandroid-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-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_r12ndk-sysroot-r21android10-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-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: 0e01d87593 Change-Id: I83ce519b864b8c2bf230234157928874db337b37
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I12eefda4a4a88f65b9116901ed250f764e984d93
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I598ebd0579d77c70139670be9a7e83ff4224571e
2019-01-24Merge "Add default code reviewers into OWNERS" am: ccad735546 am: d5987b6177Chih-hung Hsieh
am: 21e623d7e6 Change-Id: I76c48a7bf18801bdeeab3d21c7e94f32e593303a
2019-01-24Merge "Add default code reviewers into OWNERS" am: ccad735546Chih-hung Hsieh
am: d5987b6177 Change-Id: If52657280bda7911cbb5254a599578c6e3a00f5e
2019-01-24Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
am: ccad735546 Change-Id: I11104d5f18265e32b406f9f0c8d1554fe064a786
2019-01-25Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
2019-01-24Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I1cf5778e622307fc508189991a3d6c24ce6806ac
2018-11-16Merge "Convert to Android.bp" am: 926a9ca483 am: 036ff47227Dan Willemsen
am: 1bfd896f16 Change-Id: I1dfc4fa629548cc7dc77b8e584e56f1382903bd0
2018-11-16Merge "Convert to Android.bp" am: 926a9ca483Dan Willemsen
am: 036ff47227 Change-Id: I13eb7bddde8c002700d3bdd8985bcc6b9f8e4ac7
2018-11-16Merge "Convert to Android.bp"Dan Willemsen
am: 926a9ca483 Change-Id: I242ab3700840a5cf261109fb168ed600588615dd
2018-11-17Merge "Convert to Android.bp"Treehugger Robot
2018-11-16Convert to Android.bpDan Willemsen
See build/soong/README.md for more information. Test: cd external/dnsmasq; mma Change-Id: I1daeca783a0f78f2382fc4d471c4d1191c6e7032
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: c26cd5df19 -s ours am: 7cc48d7a68 -s ours am: f0950a4af2 -s ours Change-Id: Ic6267bfeb1575e6ff281a926815685cc46166bc5
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: c26cd5df19 -s ours am: 7cc48d7a68 -s ours Change-Id: I75a140eb10bee5057c28d96233a6a4ba0881d8cd
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 20:52:59 +0000