summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-02-02Snap for 11400057 from 2f5d40b1318f1758ad1397fdaf4bd65a54e60ff6 to ↵simpleperf-releaseAndroid Build Coastguard Worker
simpleperf-release Change-Id: I217719c460c81f4eb713f524ebaee8003b9725a8
2024-01-30[DON'T BLOCK] Test ownership migration rulesAditya Choudhary
This CL is created as a best effort to migrate test targets to the new android ownership model. If you find incorrect or unnecessary attribution in this CL, please create a separate CL to fix that. For more details please refer to the link below, <add g3 doc link> Bug: 304529413 Test: N/A Change-Id: I0e9d8976c992124750b47ab443703a3b0dc5ccbd
2023-12-14Merge "Uptesting is moving folks to /external/robolectric from ↵Treehugger Robot
/external/robolectric-shadows" into main
2023-12-14Uptesting is moving folks to /external/robolectric from ↵Rex Hoffman
/external/robolectric-shadows We maintain /external/robolectric (keep it in sync with github/google3) and are getting ready to delete /external/robolectric-shadows Upgrading this repo to use the latest version of roboelctric dependencies. Bug: 314757990 Test: CI Change-Id: I3306f02969795d5e946782d38e5cdfcf25d61c25
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: If704cb3fc0f3698dbdedba4d83d515d001835c2a Bug: 315507370 Change-Id: Ib3520155e347d9bb6afdfa6e4d7f0214524e0662
2023-10-30Snap for 11024862 from 678506cfb74f9f0dcc5abb6b2e6218097c128e35 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I8a7268dbd4124ebd600b725055a86af40201a65f
2023-10-24libwifi-hal: Do not reference mokey namespace am: 678506cfb7tmp_amf_315507370Jooyung Han
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/2789990 Change-Id: If704cb3fc0f3698dbdedba4d83d515d001835c2a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17Merge 10952656Xin Li
Merged-In: Ifa5c078e9a82ebfa5e7b840dbbfe20348ff4c747 Change-Id: I58259bd1763af3580e3b958640ed207b0b7a8553
2023-10-17libwifi-hal: Do not reference mokey namespaceJooyung Han
mokey namespace might not be available. So instead of referencing the namespace directly, introduce an intermediate "cc_defaults" in the global (libwifi-hal-mediatek) which, in turn, references mokey namespace. libwifi-hal-mediatek can be defined even where mokey is not available. Bug: 304688466 Test: lunch mokey & m libwifi-hal Merged-In: Iaf561831a87a59a6f4ee0f08bf595c28a8dd2562 Change-Id: Iaf561831a87a59a6f4ee0f08bf595c28a8dd2562 (cherry picked from commit 4d23f262b17bc7ce36a17533b6d9c648260c834a)
2023-10-16Snap for 10957012 from 4d2f36d50f6a96c23a98c11617782fde04d4a5c2 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: Ibcd504f076f078fe9e6bdbce7f1d2f3b4d23330c
2023-10-07Clean up obsolete aliases for Truth. am: 4d2f36d50f am: 929c99d14c am: ↵Krzysztof Kosiński
1e929c738a am: ac372919f1 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/2778069 Change-Id: Ifa5c078e9a82ebfa5e7b840dbbfe20348ff4c747 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Clean up obsolete aliases for Truth. am: 4d2f36d50f am: 929c99d14c am: ↵Krzysztof Kosiński
1e929c738a Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/2778069 Change-Id: I7aa194949d8f6c49fb192771ed53c935b14fe5f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Clean up obsolete aliases for Truth. am: 4d2f36d50f am: 929c99d14cKrzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/2778069 Change-Id: I99ba070def9faa7d6fad706c65f95402198dd896 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Clean up obsolete aliases for Truth. am: 4d2f36d50fKrzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/2778069 Change-Id: Iee36f3f96e0cc61763e4997779fc02a075ed7364 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Clean up obsolete aliases for Truth.Krzysztof Kosiński
Bug: 255714762 Test: presubmit Change-Id: I9cd21c0faf7afc77210707af61499a80d131e933
2023-10-06[automerger skipped] Merge Android 14 am: fe8b95a5b9 -s ours am: 9f51f77450 ↵Xin Li
-s ours am: a32bd2a70f -s ours am: 4c0fc06a85 -s ours am skip reason: Merged-In Ida05241ae21be828c2840318122195567f12473f with SHA-1 0268d7cceb is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/2775992 Change-Id: Id659d429d10d204833d758f67abdacbbafa9736c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: fe8b95a5b9 -s ours am: 9f51f77450 ↵Xin Li
-s ours am: a32bd2a70f -s ours am skip reason: Merged-In Ida05241ae21be828c2840318122195567f12473f with SHA-1 0268d7cceb is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/2775992 Change-Id: I7c45184b5c3eb139be4437709c9a6c1b3e4f8af0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: fe8b95a5b9 -s ours am: 9f51f77450 ↵Xin Li
-s ours am skip reason: Merged-In Ida05241ae21be828c2840318122195567f12473f with SHA-1 0268d7cceb is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/2775992 Change-Id: Ie72ab2045d202ec8f72c37ce28f75f56cdd9dcd8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: fe8b95a5b9 -s oursXin Li
am skip reason: Merged-In Ida05241ae21be828c2840318122195567f12473f with SHA-1 0268d7cceb is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/2775992 Change-Id: I10bcbbed2daa0c2fd33ac59125d2ef7540475fbc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: Ida05241ae21be828c2840318122195567f12473f Change-Id: I2f5931655faa86c63c4c7d2960147d42adbbbff2
2023-09-25Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
62127bbd6a -s ours am: 5b4ea78b18 -s ours" into udc-d1-dev-plus-aosp am: 9a2f796bce -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/24834231 Change-Id: I4e9f02e5008d1f1d97f179116b5ab771e4d65c68 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
62127bbd6a -s ours am: 5b4ea78b18 -s ours am: f3bfea0fa1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/24834231 Change-Id: Iee381f0bc0a22fc3477e5daf4e6501fbaa6e436e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
62127bbd6a -s ours am: d2a3339279 -s ours am: 5635e8347c -s ours" into udc-qpr-dev-plus-aosp
2023-09-25Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
62127bbd6a -s ours am: 5b4ea78b18 -s ours am: 0add83555e -s ours" into udc-qpr-dev-plus-aosp
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
62127bbd6a -s ours am: d2a3339279 -s ours am: 5635e8347c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/24834231 Change-Id: Ica8c03beca3dc970686f0975bf2d53b7e79f47ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
62127bbd6a -s ours am: 5b4ea78b18 -s ours am: 0add83555e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/24834231 Change-Id: I3840300e67e61b4c4bd7d1af08d5f2ffb56cd243 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
95a055cd1d -s ours am: 451adcc84a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/24834232 Change-Id: I1d318da0195db7862c14463febe638533b7e6ee8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
62127bbd6a -s ours am: 5b4ea78b18 -s ours" into udc-d1-dev-plus-aosp
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
62127bbd6a -s ours am: 5b4ea78b18 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/24834231 Change-Id: I3ea78c22974518e711459e655649aed7d58eb164 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
62127bbd6a -s ours am: d2a3339279 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/24834231 Change-Id: I2a7e4219745a4582b221b5a1fb60497b6bb4a29c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
62127bbd6a -s ours am: 5b4ea78b18 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/24834231 Change-Id: I6bc8e3a7e4a5643cc39507d5a1007d563de5241f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
62127bbd6a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/24834231 Change-Id: I381db262fafe88d3dba1c7a36d7eb829cf7dbb05 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
95a055cd1d -s ours am: b4b3db4cfc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/24834232 Change-Id: I20b9a387261c3ebf598d4fb6b2fd6010a03bc7b1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
62127bbd6a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/24834231 Change-Id: Id6c340ba461d1b5bc72f072a770ed29ccef660bb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
95a055cd1d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/24834232 Change-Id: I9e9d5f257d94365811a414b728e7d63cc6b189f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
95a055cd1d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/24834232 Change-Id: Ie37a2573c6f6462a988e8a3af1b3518023f7f447 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵Treehugger Robot
udc-qpr-dev am: a5f1f75716 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/24834233 Change-Id: Id31a5e45b7943cff59239b055667b6237fd2109d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
9c28e1a474 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/24834233 Change-Id: Ic86b0e34c8eb29ed00275616ccaf22fc97126672 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-devTreehugger Robot
2023-09-21Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I336b2f79b84dea85ea4415a4b214770a233c8547
2023-09-21Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I3f67ae240b4460a1cbf104180cea461cda8eb418
2023-09-21Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I153b7ee6deee8b47524e65ab751d50b1d9179df2
2023-09-22Merge "Remove known network and hotspot network entries from ↵Treehugger Robot
handleServiceDisconnected." into udc-qpr-dev am: 552b2d4897 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/24830555 Change-Id: I434459945fd204e8032dd070582bec18e5622ba4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22Merge "Remove known network and hotspot network entries from ↵Treehugger Robot
handleServiceDisconnected." into udc-qpr-dev
2023-09-22Remove known network and hotspot network entries from handleServiceDisconnected.Matt Walliser
Bug: 301515795 Fixes: 301515795 Test: atest -c com.android.wifitrackerlib.WifiPickerTrackerTest Change-Id: Ia0535f2acbc23b0c19e985157c2898e54c2b2048
2023-09-19Fix bug where HotspotNetworkEntry displays connecting after disconnect. am: ↵Matt Walliser
ac656b737c Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/24794300 Change-Id: I7559d250f607c05c4e083a3153027a1729fc96bd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Fix bug where HotspotNetworkEntry displays connecting after disconnect.Matt Walliser
This is caused by the connecting flag not getting reset on connection. Changing HotspotNetworkEntry to use mCalledConnect from base class. Test: atest -c com.android.wifitrackerlib.HotspotNetworkEntryTest Bug: 300996213 Fixes: 300996213 Change-Id: Iaafdcab97dc8457b4d79c4eb7187209a2c6bdc86
2023-09-15Make enable verbose logging on userdebug build am: a51b136bd1Nate Jiang
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/24773357 Change-Id: Ib3f53eff940a6f0acc8f6f6480082729f0060967 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15Make enable verbose logging on userdebug buildNate Jiang
This causing UI change which is not expected, will enable this when the UI issue fixed. Bug: 300582883 Test: manully verify the UI Change-Id: I33a3f9a41756660cf07c810dc14b5629fc03e568
2023-09-14Merge "Add missing methods to HotspotNetworkEntry." into udc-qpr-dev am: ↵Matt Walliser
69b82a9878 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/24708359 Change-Id: I2779622529876cf2c444d3d1a4bfdb361bbcb780 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>