summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-07Snap for 7802582 from 53d3b8dff4802e02703dc86edbb971f3f940871e to ↵android-mainline-12.0.0_r42android-mainline-12.0.0_r22android12-mainline-art-releaseAndroid Build Coastguard Worker
mainline-art-release Change-Id: I15d2ff9932b8e9eef664b5a4fc8d94378aa0716c
2021-09-24Merge changes from topic "presubmit-am-b269971f9fbf4fac978558cd9d683a2d" ↵Bill Yi
into sc-mainline-prod * changes: [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 58d44b5266 Import translations. DO NOT MERGE ANYWHERE
2021-09-24[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 58d44b5266Bill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/15902666 Change-Id: Ia40a9cfc06408a6155ca0242fa64b86f940607ad
2021-09-24Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Icd37d5dfee1484c4032bdaf43b57080b032368a2
2021-09-24Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Idf2e0fbfb3f22a8045601386e4588e3da7910c35
2021-09-13Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodBill Yi
2021-09-11[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f393865fe5Bill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/15808230 Change-Id: Ie35914e922d971cb36ebc1ead48bbb75a00fb9a2
2021-09-11Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: If7c479b5f2e141f8e53a3bda691700dabf735263
2021-09-11Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ibd26b65b53b76041c81a9806e7592d9480d27e66
2021-09-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
72352b1f53 -s ours am: 0f81191197 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/15743679 Change-Id: Id3c8241b786b9d67b0bbcd9be941e746fa0c42f5
2021-09-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
72352b1f53 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/15743679 Change-Id: I0ad67f7cb1e0613046eceefcffc245164ce32abe
2021-09-03Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I4a99583fd24a42399595e2e293e3f3f5bfd98c49
2021-09-01Snap for 7692221 from ea9a5efe7f96dbb614930d8069176045e6a4ba02 to ↵android-mainline-12.0.0_r5Android Build Coastguard Worker
mainline-art-release Change-Id: I8bf9d6e84d9311f172dc4b24e56c7751a3b4e2fb
2021-08-18[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
8ab8def02a -s ours am: 4298750830 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/15599017 Change-Id: I3561b37ed05a4d6ab5abb3b24e0c7f3229877a9b
2021-08-18[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
rvc-qpr-dev am: d2d78cf2c9 -s ours am: 58107160bc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/15601338 Change-Id: I319df6532751b93fe92d622029a2e48b82f6c85f
2021-08-18[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
9d9456611d -s ours am: 9fcdb4b245 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/15601337 Change-Id: I6707a00d7a9d133599f4bb3e0fd3563f88095de5
2021-08-18[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
8ab8def02a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/15599017 Change-Id: Ic4ba8ab254ff668a0d404c5bc3db21dc7a1dcc4c
2021-08-18[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
rvc-qpr-dev am: d2d78cf2c9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/15601338 Change-Id: Ic382bdb4c15daa37c7534d09f5b5c3a3f0043f62
2021-08-18[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
9d9456611d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/15601337 Change-Id: I949487b7cc1de5579d925b9cec8b46a27e15653b
2021-08-18Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-devTreeHugger Robot
2021-08-17Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I74650223415090ee53241afd78a6f76f4ede3873
2021-08-17Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I2fea886e75d3e3b48d5b20de7c50afe04f6e0790
2021-08-17Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I2f0d5a17531a58c0b4824516d3d4421ca658cda0
2021-08-13[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
adb0a0aa9c -s ours am: 3856d2e245 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/15544310 Change-Id: I52c8093fac77aca39f12697858e3660b6640cbb8
2021-08-13[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
adb0a0aa9c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/15544310 Change-Id: Ie76dd32a196c6d30e9170e4ffb5a38f66e748c3d
2021-08-12Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ief2472f56a6e34856ec2d7cbbab480d4404bf628
2021-08-11[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
rvc-qpr-dev am: e98cc119aa -s ours am: d8be5ce4da -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/15507869 Change-Id: I88a4871489243931383f3853f7e667db7a796d6f
2021-08-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
84b4788981 -s ours am: 3d022a7a3f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/15509450 Change-Id: Ie28717018109a76c532a29f1b59d945e0d04208d
2021-08-11[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵android12-devTreeHugger Robot
rvc-qpr-dev am: e98cc119aa -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/15507869 Change-Id: I8182428c018af53d78a95a993780be1898c33a9e
2021-08-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
84b4788981 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/15509450 Change-Id: I4d3093bd55591944e64381611f13dba25fd5cb53
2021-08-11Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-devTreeHugger Robot
2021-08-10[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3c0098d2a8 -s ours am: 8979d91185 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/15507868 Change-Id: Ia472be7c6be9ac3f3733ed3aeabe5ddb746d16e8
2021-08-10[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3c0098d2a8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/15507868 Change-Id: I5d0d123619e70da23911f4e0c913e0b9ea5b93d6
2021-08-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Id6c57cb15e790d0c0fe8e7619665cd557829f86c
2021-08-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I9a1bf3eb5b13f435670989b0b2aef1103754cf38
2021-08-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I708217e4e039bf287b0fbf6e1c190b75a2f5825d
2021-08-05Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2021-08-04Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I99b0847b2264347c247ec300a42794ac68487e31
2021-08-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3c2532864d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/15448256 Change-Id: I54ccc85c06c3e0af2e60bc47f36c17f303f2babb
2021-08-03Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I2211fd0a57d165d5b353135356550596375d335f
2021-08-03Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ie82fad8a19c897fed3aa46279a5dad723e30a9e7
2021-07-30Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2021-07-30Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2021-07-30Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2021-07-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I76e8c6876b52b3b006d408275f941c2b93796c0c
2021-07-23Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I95c8105936fd1a73854e0d517877c5f7f84d5945
2021-07-21wifi: fix FT/EAP network detection in wifi tracker library am: cf4ad7ec55Jimmy Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/15343716 Change-Id: I021cbdaa5d1adf46a30090d4e823e0aea8f32f60
2021-07-22wifi: fix FT/EAP network detection in wifi tracker libraryJimmy Chen
Bug: 194163589 Test: use add-fake-scan to check a FT/EAP network is shown as an EAP network in wifi picker. 1. adb shell cmd wifi add-fake-scan ft-eap-test aa:bb:cc:dd:ee:ff \ [WPA2-FT/EAP-CCMP][RSN-FT/EAP-CCMP][ESS] 2412 -55 2. adb shell cmd wifi start-faking-scan 3. check that the type of the network "ft-eap-test" is EAP. Change-Id: Icf7732eb16e79d0f248ee8c631ff0500fc886d65
2021-07-21wifi: fix FILS network detection in wifi tracker library am: a7c60fb7f9Jimmy Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/15327737 Change-Id: I760c2f2d97d12d8b96966c567d0cba1501492e63
2021-07-20Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I7e8cb5c300c9f0af7aaee26437e6d88926bc69d0