summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-04-12Snap for 8441503 from 62bd1b9832399debf525a269235d2d321205e62d to ↵android-mainline-12.0.0_r126aml_wif_311811030android12-mainline-wifi-releaseAndroid Build Coastguard Worker
mainline-wifi-release Change-Id: I3b8108d4d5e3936bf82a7ac1039507dc21a87604
2022-04-11Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2022-04-11Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2022-04-11Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2022-04-11Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2022-04-11Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2022-04-11Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2022-04-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I0405d5a84e7d1cf1f6f48b0b6ad474d9e06d30a8
2022-04-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Id92ce537f08aaee1bda1d0d9113c482e664a7b11
2022-04-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ia7432a6126ee208e5c1db585122df28896593d27
2022-04-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I3bc54848de9215862ca63989e17a451788add568
2022-04-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ifc5635a9046c28ec0770ad0ac2216eceefd00ccc
2022-04-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I52c7c348d483419eb5c890a9da0b9628eddc60ef
2022-04-09Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I1fab79affe749eb8a435fd06b1a4c29710bb3d93
2022-04-07Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2022-04-07Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2022-04-07Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2022-04-07Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2022-04-07Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2022-04-07Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2022-04-07Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2022-04-07Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2022-04-07Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2022-04-07Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: ↵Remi NGUYEN VAN
49f031ea4d am: 2f74509789 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780 Change-Id: I4bac4cc8375278d29b4cdf3dc380cde5559a7e48 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4dRemi NGUYEN VAN
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780 Change-Id: I22822a2d3c5eb82a05455175c4f901bd271aefab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Disallow PAP authentication when MPPE is requested am: 4f319df8ffRemi NGUYEN VAN
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780 Change-Id: I9447047994de63d7e1f0ea09caf41093126c4228 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Snap for 8417617 from cee2a1fd344a368e48c3b58c663d1ed6d8f4bf90 to ↵Android Build Coastguard Worker
mainline-wifi-release Change-Id: Iac4a0b35b49d758191dc82f417b9ef526de5542a
2022-04-07Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into ↵Tyler Gunn
qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080 Change-Id: I1ab0b979c4ce254c01f918aa03311460f951359a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Disallow PAP authentication when MPPE is requestedRemi NGUYEN VAN
MPPE cannot work if PAP is used as authentication, so it is not useful to allow PAP authentication when MPPE is enforced: establishing the tunnel would fail anyway with "MPPE required, but MS-CHAP[v2] auth not performed". Also users enforcing MPPE may assume that this means PAP will not be used for authentication, so without this change MPPE enforcement gives a false sense of security, as PAP uses plain-text credentials. Bug: 201660636 Test: atest VpnTest Merged-In: Ie318d45fe44294e97cf38da7f1834cf014cb4417 Change-Id: Ie318d45fe44294e97cf38da7f1834cf014cb4417 (cherry picked from commit 997a4a39268b4f3af7ccc388269b5eb1972d3624)
2022-04-07Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into ↵Tyler Gunn
qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080 Change-Id: Ifc65d6af6a1623ab2c4d6d25629ebad376cb5728 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into ↵Tyler Gunn
qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080 Change-Id: I9264ab8f95bec38b438024cc7a65a6b6b720e6fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into ↵Tyler Gunn
qt-dev am: 08f8988bc3 am: 8193edd104 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080 Change-Id: I73cf3414a8bd2067fa673fe198244c86eb2726c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into ↵Tyler Gunn
qt-dev am: 08f8988bc3 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080 Change-Id: I7843acc6edf27ed2d8eece6dc2de7a05aa925b9b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add ↵TreeHugger Robot
finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours am: 7268d3d045 -s ours am: 607cc6acf4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088 Change-Id: I3fec9a0ec36c49d3011efdb96ab3d0e5e356ce03 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] [qt] RESTRICT AUTOMERGE Add ↵Jonathan Scott
finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours am: 693fe862b9 -s ours am: 4d47369e41 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088 Change-Id: I89da18b2dbe5b64eca8d86cf3987599bd737b0d0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into ↵Tyler Gunn
qt-dev
2022-04-06Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I96c47588e81ed96572a0bb06808bee1f4c7de0ad
2022-04-06[automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add ↵TreeHugger Robot
finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours am: 7268d3d045 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088 Change-Id: Ibb2467d2beb1a7a46c6354382fc6108bb5457c7b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] [qt] RESTRICT AUTOMERGE Add ↵Jonathan Scott
finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours am: 693fe862b9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088 Change-Id: I8a2b23cc9d7258d47e468f780928a32a4503bde1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I31c77b17a89997bac594361327158b184ee82c30
2022-04-06Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ie1d72e9d8a0cd0a7b886a4c266903927118c5525
2022-04-06[automerger skipped] Merge "[rvc] RESTRICT AUTOMERGE Add ↵TreeHugger Robot
finalizeWorkProfileProvisioning." into rvc-dev am: f0b395138c am: 23c3740386 -s ours am: 7744c71e64 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530 Change-Id: I975ff51ad9340bb1e3eef34764c975fe8cb051b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] [rvc] RESTRICT AUTOMERGE Add ↵Jonathan Scott
finalizeWorkProfileProvisioning. am: bde28d286e am: 62de92b4ea -s ours am: b7248d037f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530 Change-Id: If473034f431643418b642988a9d19c5dc8d6ed79 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add ↵TreeHugger Robot
finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088 Change-Id: I0472617b5f7ee1dec086aee641339497b8630659 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] [qt] RESTRICT AUTOMERGE Add ↵Jonathan Scott
finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088 Change-Id: I4c0aef4b20d7b473d5fa160b64f5e05131b2cd17 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] Merge "[rvc] RESTRICT AUTOMERGE Add ↵TreeHugger Robot
finalizeWorkProfileProvisioning." into rvc-dev am: f0b395138c am: 23c3740386 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530 Change-Id: I8217e2a43bae1be58ec76821f16b05f7fbf0bf43 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] [rvc] RESTRICT AUTOMERGE Add ↵Jonathan Scott
finalizeWorkProfileProvisioning. am: bde28d286e am: 62de92b4ea -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530 Change-Id: I79744a8cbee16ade46d2f7eb0849b3c6fd41de6e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add ↵TreeHugger Robot
finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088 Change-Id: I0501b2bfddaf5e666c6962b898d8698abbfa01de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] [qt] RESTRICT AUTOMERGE Add ↵Jonathan Scott
finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088 Change-Id: Ie1052d196899df0aa598d0fe95b318a6cf737493 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Merge "[sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into ↵TreeHugger Robot
sc-dev am: 6485eee24f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567806 Change-Id: I487cd8a2444ff0d06f6f4fd497913185fca5f97b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>