summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-11-07Snap for 11063562 from 0cee8f7769d3953c23db83ce62603de03f76c2f3 to ↵aml_art_341411300aml_art_341311100android14-mainline-art-releaseAndroid Build Coastguard Worker
mainline-art-release Change-Id: I625971719452a43ee82d3338bf425bcf9fe54ade
2023-11-06Merge "Assign default bug component to targets in this directory." into main ↵Treehugger Robot
am: 41f5dee7e4 Original change: https://android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/2817557 Change-Id: I447cd0a3e57e89b68640cd59db4c1ccc28f76833 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06Merge "Assign default bug component to targets in this directory." into mainTreehugger Robot
2023-11-06Merge "Bump CaptivePortalLogin target SDK to 34" into main am: e60c53b7ddRemi NGUYEN VAN
Original change: https://android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/2817255 Change-Id: Id3364de692ffc8161217ebd2314bd932daf91520 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06Merge "Bump CaptivePortalLogin target SDK to 34" into mainRemi NGUYEN VAN
2023-11-06Bump CaptivePortalLogin target SDK to 34Remi NGUYEN VAN
See behavior changes: https://developer.android.com/about/versions/14/behavior-changes-14 As per the new foreground service type declaration requirement, this change adds one for the download service. As per the newer restrictions on implicit intents, the test needs to export its test activity that receives test downloaded files. Bug: 308675030 Test: atest CaptivePortalLoginTests Change-Id: I4c14e870d3992e65c052a72b97560d01a39dbd54
2023-11-03Snap for 11049560 from 169d3deb013b6d6e734e0e11d63397dda51fb881 to ↵Android Build Coastguard Worker
mainline-art-release Change-Id: I800262a06d400aa6bc1598ec2f2356f278615081
2023-11-03Assign default bug component to targets in this directory.Dario Freni
This CL is being created to improve the test attribution in android. It has been found that the tests owned by this OWNERS are not not being attributed to a buganiser component. This is part of a bigger effort to attribute all of the aosp code. If you think that the buganiser component is not correct please update this CL with correct component and drop a +2. We will use the updated component and merge the CL Bug: 309090038 Change-Id: I7c21639e295268ddc1ba2581c8d307db6a615fb2 Test: N/A
2023-10-27Fix letter overlap in warning message am: 0086c9445dSoyun Bang
Original change: https://android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/2803420 Change-Id: Ied1158af94a74059e5746bfa447427bc59c72e2e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25Fix letter overlap in warning messageSoyun Bang
It was adjusting the spacing between letters through the height of the container surrounding the letters. If the font size is larger than height, the letters overlap. Therefore fix to adjust the spacing between letters with margin rather than height. Bug: 303748201 Test: 1. Increase the font size as much as possible. 2. Set the mobile time to 1 year ago to induce ssl failure. 3. Connect to an AP that supports captiveportal. 4. Check if the messages overlap. Change-Id: I0efc74a05c4b6e0ff2c31cd87e5189e05f4bcca9
2023-10-06Merge Android 14 am: ecbbdfbba3Xin Li
Original change: https://android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/2775841 Change-Id: I3efc78328451a16a9caf4ff4fc7364d284b410fa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: I5d4fc58af144ffe6d8ae58af61980ae2a25739b7 Change-Id: I2b33dcf48d05f39485a6b450a8b7755c34b852d7
2023-09-02Snap for 10755155 from 50d8c6c025bc00f12e9fb37b9775815907418042 to ↵aml_art_341110110aml_art_341110060Android Build Coastguard Worker
mainline-art-release Change-Id: I97f686c93c0371e4f19fcafef2daf76ebe586dde
2023-08-31Import translations. DO NOT MERGE ANYWHEREtmp_amf_298295554Bill Yi
Auto-generated-cl: translation import Change-Id: I5d4fc58af144ffe6d8ae58af61980ae2a25739b7
2023-08-17Merge Android U (ab/10368041)Xin Li
Bug: 291102124 Merged-In: I7d72ca5a68c52b05adf34ca27239036c58ce1e79 Change-Id: I41e1127c78688eb0a6b94048ad862e00b4e59242
2023-08-17[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
51388867a1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/24435624 Change-Id: Iee19dc4cf803e27e65a4e05689b4d4084b0ac66c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I5fba5d2c854a63251a2ac08e368562ebbacb25ed
2023-08-15Fix kotlin nullable errors in CaptivePortalLogin tests am: d2d0976b02Colin Cross
Original change: https://android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/2700796 Change-Id: I41b6388d05e42558e5a9ec3092ccd539383c1d71 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15Fix kotlin nullable errors in CaptivePortalLogin tests am: d2d0976b02Colin Cross
Original change: https://android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/2700796 Change-Id: I4cebc8acaf5fb801d28d6449012ff25faa1586ed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09Fix kotlin nullable errors in CaptivePortalLogin testsColin Cross
Fix kotlin nullable errors that were exposed by setting the retention of android.annotation.NonNull and android.annotation.Nullable to class retention. Bug: 294110802 Test: builds Change-Id: I69e7163e06a116a27f1db9734b863636624d3428
2023-08-07Snap for 10620181 from c6ca69e6c50f51f0e556fa2c16aff5587a6226db to ↵aml_art_341010050Android Build Coastguard Worker
mainline-art-release Change-Id: I19527263e6123b98a6cd03584494ccde9bf2c652
2023-07-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
e09909b935 -s ours am: d8a4cbc4fe -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/24214991 Change-Id: I4f3b2d82ed218e8a2128651f9650c7b85f319b60 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
e09909b935 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/24214991 Change-Id: I688295a2d563aa01fc63db316ed53c2c53e3771f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
4fd07d3600 -s ours am: f7041176d1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/24215161 Change-Id: Ie2bec426737475c26ca5fab164a3d5121b52bfa0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
4fd07d3600 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/24215161 Change-Id: Ibbed31e41a41bc7b7414fe27d78dece980fbaa9f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Id4ffa0ab9e80e2c107d9c2b103ab831ac184d1d2
2023-07-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Iaca49566ef7e155da8160e0d510451b21798d2b5
2023-07-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ida1425fb7ea7b6828e4f8eaea79ed6688930ea21
2023-07-18Move OWNER reference master=>main. am: 9fe623161fSam Saccone
Original change: https://android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/2661044 Change-Id: I7cac2dde7530c455956dc5ebd932fe8e171cd98e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Move OWNER reference master=>main. am: 9fe623161fSam Saccone
Original change: https://android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/2661044 Change-Id: Iffdadbedfa9b742fbd75c8033adde5302dc138d0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Move OWNER reference master=>main.Sam Saccone
BUG=b/291759353 Change-Id: Ic2921fd04e01ada69513ecdc154d64226f057218
2023-07-07Snap for 10453563 from fbf13440adc84834dcd2c82a9509e96e7f5f6206 to ↵aml_art_340915060Android Build Coastguard Worker
mainline-art-release Change-Id: I28041eb4bde4b64b1b423a060014e439b1f513eb
2023-06-22Merge "CaptivePortalLogin: bump min sdk 29(Q) to 30(R)" am: 122b52dda2 am: ↵Maciej Żenczykowski
00813a4206 am: 6e08ff5a95 Original change: https://android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/2627934 Change-Id: I7d72ca5a68c52b05adf34ca27239036c58ce1e79 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22Merge "CaptivePortalLogin: bump min sdk 29(Q) to 30(R)" am: 122b52dda2 am: ↵Maciej Żenczykowski
00813a4206 Original change: https://android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/2627934 Change-Id: Id771d772dcb512d16c30d18dfbfa89947437caa5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22Merge "CaptivePortalLogin: bump min sdk 29(Q) to 30(R)" am: 122b52dda2Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/2627934 Change-Id: I63ccf04e102de551f859e34fd6b26aa8215777dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22Merge "CaptivePortalLogin: bump min sdk 29(Q) to 30(R)" am: 122b52dda2Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/2627934 Change-Id: Ic4f675dfab775cb400eb59f77d930738a2075895 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22Merge "CaptivePortalLogin: bump min sdk 29(Q) to 30(R)"Maciej Żenczykowski
2023-06-21[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0c34f1b3fe -s ours am: 1e39600062 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/2614683 Change-Id: I4b7c356c63ce310212fa77e01785ee7006347275 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ae2485ad19 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/23561082 Change-Id: I207438c4b8a52dd6a8f23ab3d0063bd58ce2889d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21Skip captive portal login related tests in wearable device. am: 808dbd3094 ↵chiachangwang
am: db134b8cf5 Original change: https://android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/2570112 Change-Id: Ia001e19f016446ae2df3dea6054b8f752155d2a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
c2a23168e4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/22801344 Change-Id: Iacf8c158b3967a92e5830d9a7588e29cf6c3c153 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21[automerger skipped] Merge Android 13 QPR3 ↵Xin Li
tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 34e0f6315e -s ours am skip reason: Merged-In Ia2c1fee423296aa327848ef2da8bbdb32efcc947 with SHA-1 79bf475656 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/22724800 Change-Id: Ib3a45e5cc1df2dbaeb5c2277bfc4d9201aba4e55 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-18CaptivePortalLogin: bump min sdk 29(Q) to 30(R)Maciej Żenczykowski
Mainline push to Q was stopped in February 2023. Test: TreeHugger Bug: 283996141 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I74d6d6b7df77e20181b9b823a0365ad9bf56e16c
2023-06-08[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0c34f1b3fe -s ours am: 1e39600062 -s ours am: 15c9eac494 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/2614683 Change-Id: Ia6ea48ad035da74ed0d91dfbf202bca019a1cdd2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0c34f1b3fe -s ours am: 1e39600062 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/2614683 Change-Id: Ib591379fd5c222141625219992d1d42ed0da21b9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0c34f1b3fe -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/2614683 Change-Id: I3d4a83d8d3a46214bf32cd3f2f66b9bcb4ba8834 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0c34f1b3fe -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/2614683 Change-Id: Ibf12d269210d04e921b09fd18c7b57bf76bda557 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ae2485ad19 -s ours am: 524e2ca37d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/23561082 Change-Id: I0de20ef0a2bcbd08b98d13a2ea4454e0e6073026 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ae2485ad19 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/23561082 Change-Id: I2b715161b686b087b6cced467e4863531f4c739e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I1214457fa5f9835b26db92abc962bdec5d70b93c
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 18:11:50 +0000