summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-01-01Snap for 9447015 from 5f8c650f1fea5fe874214457f819427f2b83e161 to ↵android-13.0.0_r49android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseAndroid Build Coastguard Worker
tm-qpr2-release Change-Id: I012918f3e4e08ba157b86c4f1b85429b3c9a6dcb
2022-12-29Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I8359f68129c5f2cb5cdab332b2c1e35adb8f3b93
2022-12-17Snap for 9416697 from 291deb2ff70584a6d09f327c662e8ce80a51bf1d to ↵Android Build Coastguard Worker
tm-qpr2-release Change-Id: I0398beaf46110b7f9aff07d6804f5205d3879e12
2022-12-16Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: If91ab38461bcf9e04d8cc705ee1b41459ddda95d
2022-12-10Snap for 9390188 from 356bf9b6929164d0342c700d143b5058301ec8ae to ↵Android Build Coastguard Worker
tm-qpr2-release Change-Id: I7119b2ad1f652bb8287114b13e899ff3c9580090
2022-12-07Expose multiple security type utilities to SettingsWeng Su
- Settings app needs to get multiple security types from ScanResult - Use the same utility to avoid inconsistencies Bug: 205943818 Bug: 249713442 Test: manual test Merged-In: I923dd420e52ac9b5dcc41867ede4b2307387b5d8 Change-Id: I923dd420e52ac9b5dcc41867ede4b2307387b5d8 (cherry picked from commit 88400e8ad4fdd139fd20647523545af6f04b1010)
2022-12-03Snap for 9364794 from 6c158d6f71d35ec9e3b1e8fda6aa61a7dbade36d to ↵Android Build Coastguard Worker
tm-qpr2-release Change-Id: If5b315c5644cf8f6dac90349ad38916cc2dacebe
2022-11-30Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I58d23c067b75015ec634be5580e2bae3efa637a2
2022-11-24Snap for 9325773 from 97ac8f61349ad4a8fe3f94e21e2cb8d6014a1e17 to ↵Android Build Coastguard Worker
tm-qpr2-release Change-Id: I1c563396fa126f8fc7eddbaeaaad4e4366713eb1
2022-11-22Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ic3cf1296522e41afefb77e037a9c2e3d246491d6
2022-11-18Snap for 9305793 from 23188beab7e63e0cb1f635b1b098464515ab1305 to ↵Android Build Coastguard Worker
tm-qpr2-release Change-Id: I70d04aa6b4ffababf096ed0d4a2fbd2d00f5ed03
2022-11-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-devBill Yi
2022-11-17Snap for 9301146 from 796c05be1c73ec94d55f6575df1b04a68ef120da to ↵Android Build Coastguard Worker
tm-qpr2-release Change-Id: I22ea47bfe61257bcff7ef06cc8d6c09eb84b9ff1
2022-11-16Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I1d848107da150386bb2dbc916fb83b7e5d51f248
2022-11-15Show "Connected / No internet access" for expected internet networksQuang Luong
Networks that are expected to have internet access (i.e. the user hasn't accepted to stay connected via the "No internet" dialog) should show "Connected / No internet access" instead of "Connected to device. Can't provide internet." Bug: 230794429 Test: atest WifiTrackerLibTests, manually verify string when connected to a no-internet network Change-Id: I073df8b59b5069b750cc8b669055f35b60e0ee97
2022-11-15Snap for 9290907 from 4c6f4b77a6e6636d281fa61b7c08a83e48672b5a to ↵Android Build Coastguard Worker
tm-qpr2-release Change-Id: I2fcc907126e728456f2d19e0092edb52704af085
2022-11-14Show "Checking for internet access..." if network not validated yetQuang Luong
Wifi picker currently shows "Connected to device. Can't provide internet" for any network that doesn't have validation. However, this is confusing for networks that are expected to have internet but are still in the middle of validation. Thus we should show "Checking for internet access..." while we're in the middle of validation, and then show the other message once the validation attempt fails. Bug: 230794429 Test: atest WifiTrackerLibTests, manually verify "Checking for internet access..." appears in Wifi picker network summary. Change-Id: I00d8061eaa75123ed1b8e6edf118363c74d8fde7
2022-11-11Add a lint baseline for WifiTrackerLibColin Cross
The lint version in tm-qpr-dev incorrectly flags NonSdkApiWrapper.java. Add a lint-baseline.xml file to silence the incorrect error. The newer version of lint in master doesn't have the false positive. Bug: 258754271 Bug: 256019562 Test: m RUN_ERROR_PRONE=true javac-check lint-check Change-Id: I10e1c331b9e3a8c505826ef5d152916c6db586bf Merged-In: I3adb8c2b47bb1712b0df2907ee3c969fbbe9a979
2022-10-29Snap for 9232464 from 162ef4fe2a443d99f32cbed0f0ceb988713d0ac4 to ↵Android Build Coastguard Worker
tm-qpr2-release Change-Id: I968056acf17d619b22c90e1522c1e74f5792a416
2022-10-28[automerger skipped] [RESTRICT AUTOMERGE] Only handle saveToStore from the ↵Nate(Qiang) Jiang
WifiNetworkSuggestionsManager am: 543a0f9677 -s ours am: 1a0d9da226 -s ours am: 6b5a08b280 -s ours am: 890a5a1efb -s ours am: c34dbb9a88 -s ours am: 9de8a3c564 -s ours am: 108e54d5de -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/20293997 Change-Id: I91f3ae880952a3822eb0588ac6d81e4d6e8d795a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28[automerger skipped] [RESTRICT AUTOMERGE] Only handle saveToStore from the ↵Nate(Qiang) Jiang
WifiNetworkSuggestionsManager am: 88d4c3a93c -s ours am: 06dffa5376 -s ours am: 953400b316 -s ours am: 9152523bc0 -s ours am: c069464da4 -s ours am: f5c173545e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/20294383 Change-Id: Ie736daeb83f95c073ecf35d742ee7dd3e627cb29 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28[automerger skipped] [RESTRICT AUTOMERGE] Only handle saveToStore from the ↵Nate(Qiang) Jiang
WifiNetworkSuggestionsManager am: 543a0f9677 -s ours am: 1a0d9da226 -s ours am: 6b5a08b280 -s ours am: 890a5a1efb -s ours am: c34dbb9a88 -s ours am: 9de8a3c564 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/20293997 Change-Id: I84dd950c335d79bcffe313ed1919352a18466ccf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28[automerger skipped] [RESTRICT AUTOMERGE] Only handle saveToStore from the ↵Nate(Qiang) Jiang
WifiNetworkSuggestionsManager am: 88d4c3a93c -s ours am: 06dffa5376 -s ours am: 953400b316 -s ours am: 9152523bc0 -s ours am: c069464da4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/20294383 Change-Id: Ie9f986ee3e35bb0d43ddad6719707fcad4746c0d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28[automerger skipped] [RESTRICT AUTOMERGE] Only handle saveToStore from the ↵Nate(Qiang) Jiang
WifiNetworkSuggestionsManager am: 543a0f9677 -s ours am: 1a0d9da226 -s ours am: 6b5a08b280 -s ours am: 890a5a1efb -s ours am: c34dbb9a88 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/20293997 Change-Id: I60bfb7f29c174206bcba3f1593e751f266a28bc5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28[automerger skipped] [RESTRICT AUTOMERGE] Only handle saveToStore from the ↵Nate(Qiang) Jiang
WifiNetworkSuggestionsManager am: 88d4c3a93c -s ours am: 06dffa5376 -s ours am: 953400b316 -s ours am: 9152523bc0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/20294383 Change-Id: I033a422af1f120316685e3afb44967515eba355b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28[automerger skipped] [RESTRICT AUTOMERGE] Only handle saveToStore from the ↵Nate(Qiang) Jiang
WifiNetworkSuggestionsManager am: 543a0f9677 -s ours am: 1a0d9da226 -s ours am: 6b5a08b280 -s ours am: 890a5a1efb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/20293997 Change-Id: I54d04fc8bf7ff30e06dbce545f3c58bffb1b941e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28[automerger skipped] [RESTRICT AUTOMERGE] Only handle saveToStore from the ↵Nate(Qiang) Jiang
WifiNetworkSuggestionsManager am: 88d4c3a93c -s ours am: 06dffa5376 -s ours am: 953400b316 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/20294383 Change-Id: I04df5349420cb91b00d466943432388c787fb2b9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28[automerger skipped] [RESTRICT AUTOMERGE] Only handle saveToStore from the ↵Nate(Qiang) Jiang
WifiNetworkSuggestionsManager am: 543a0f9677 -s ours am: 1a0d9da226 -s ours am: 6b5a08b280 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/20293997 Change-Id: I5877c1b68a278d426901b53961e941b3fdaa438e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28[automerger skipped] [RESTRICT AUTOMERGE] Only handle saveToStore from the ↵Nate(Qiang) Jiang
WifiNetworkSuggestionsManager am: 88d4c3a93c -s ours am: 06dffa5376 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/20294383 Change-Id: I6f9684f09e0c1762db37711d78cc3bfa78f0c017 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28[automerger skipped] [RESTRICT AUTOMERGE] Only handle saveToStore from the ↵Nate(Qiang) Jiang
WifiNetworkSuggestionsManager am: 543a0f9677 -s ours am: 1a0d9da226 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/20293997 Change-Id: I2ec76a229646ab20ae12f0580a62bbb194af16eb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28[automerger skipped] [RESTRICT AUTOMERGE] Only handle saveToStore from the ↵Nate(Qiang) Jiang
WifiNetworkSuggestionsManager am: 88d4c3a93c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/20294383 Change-Id: I15cf90dab1adad0e837b0ff7a4df91fb0e33998c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28[automerger skipped] [RESTRICT AUTOMERGE] Only handle saveToStore from the ↵Nate(Qiang) Jiang
WifiNetworkSuggestionsManager am: 543a0f9677 -s ours am skip reason: Merged-In I8fd038c41399f9f04dda278a6e67b8a5d1d42e44 with SHA-1 88d4c3a93c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/20293997 Change-Id: Ida49fd6cdd458026e97c5232e5518ebff0e9cd70 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26[RESTRICT AUTOMERGE] Only handle saveToStore from the ↵Nate(Qiang) Jiang
WifiNetworkSuggestionsManager Suggestion app may add a list of passpoint suggestions, only saveToStore once to reduce the number of writing xml. Also remove the suggestions which trigger the OOM exception Bug: 245299920 Test: atest com.android.server.wifi Merged-In: I8fd038c41399f9f04dda278a6e67b8a5d1d42e44 Change-Id: I8fd038c41399f9f04dda278a6e67b8a5d1d42e44
2022-10-26[RESTRICT AUTOMERGE] Only handle saveToStore from the ↵Nate(Qiang) Jiang
WifiNetworkSuggestionsManager Suggestion app may add a list of passpoint suggestions, only saveToStore once to reduce the number of writing xml. Also remove the suggestions which trigger the OOM exception Bug: 245299920 Test: atest com.android.server.wifi Merged-In: I8fd038c41399f9f04dda278a6e67b8a5d1d42e44 Change-Id: I8fd038c41399f9f04dda278a6e67b8a5d1d42e44
2022-10-12Snap for 9167942 from bff1b94df76c485278201b3944c9d5ea3ed64a2c to ↵Android Build Coastguard Worker
tm-qpr2-release Change-Id: Iad3b07a6763ecd47f397f457f1b3aab324342f9e
2022-10-12Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-devTreeHugger Robot
2022-10-12[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
tm-d1-dev am: 3003ba049a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/20149125 Change-Id: I58addfd26c41738ff6026831374cd088f5642f9d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
5c7b04e03a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/20149125 Change-Id: I91eb68b21270a03e2d2cab85920be5b3d1268cdb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-devTreeHugger Robot
2022-10-11Snap for 9163457 from 089e6edc223987a1eedffc3287e3ea93c56aadef to ↵Android Build Coastguard Worker
tm-qpr2-release Change-Id: Ib44fc8dc878ab12b44f37b2a619a4dcb61af9e9c
2022-10-10[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
b69b4c3ce9 -s ours am: abfe34a09e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/20149123 Change-Id: I8e933759414e52981db7e4e2ef0c62f46e7ca981 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
b69b4c3ce9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/20149123 Change-Id: I525f9144c4abe59da37e24a7028ba0ed3accf5c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-09Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Icd33553f16f384c657a48bed7de723bc8af9fcd7
2022-10-09Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Iae777ff9a934a44e2e44f680f65ae58ca569974f
2022-10-09Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ieeeafa395075db20034a1f66c9b64578563b2687
2022-10-03Snap for 9133013 from 2b7835df75a809d3cb6805afbd12d814ae8bfe19 to ↵Android Build Coastguard Worker
tm-qpr2-release Change-Id: I6fde880e560f93b70f9032473d01b296215b3325
2022-10-02[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3f0dac5e48 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/20085019 Change-Id: Ic4b5d1b9e37583f23e5571f35f9a1114a0893fc6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I179c306e65fcbd60fd7438e375916be39a3c6813
2022-09-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I3bb539f55cd22ead2bfd4bb0ccc0d7d4afef428f
2022-09-26[automerger skipped] [DO NOT MERGE] wifi: Reset to default SAP configuration ↵Les Lee
when doing factory reset am: e025228677 am: 6b861fb74b -s ours am: b43f96cbd5 -s ours am: 7a7963e2fb -s ours am: c53b63bdb2 -s ours am: 407f46c23a -s ours am: c35f3698c8 -s ours am: f65fccec18 -s ours am: 6a7d6c0785 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/19693691 Change-Id: I9d0e35ac63e0e14e64944903993e4ae6504adf68 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>