summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-03Snap for 10428683 from 49a242811007889d591c9f7322d914d46e9ae669 to ↵aml_adb_341520010aml_adb_341517070aml_adb_340912530aml_adb_340912350aml_adb_340912200aml_adb_340912000android14-mainline-adbd-releaseAndroid Build Coastguard Worker
mainline-adbd-release Change-Id: Ida0d3056cb36c03f1937e194a332a6e8ee3162a2
2023-03-25WiFi: Modify OWNERS files am: 9a024652c8Roger Wang
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/22239512 Change-Id: I6255057ab5c83a7416e020d26a71aaaecd94c41a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-25WiFi: Modify OWNERS filesandroid14-devRoger Wang
add kumachang@ in OWNERS file Bug: 274850026 Test: None Change-Id: Ie1c944b68cd175359f552afc6833c0a9524e7a2c
2023-02-10Create variables for PNO scan interval in wificondBruno Kremp
Set PNO scan iterations and interval multiplier as variables and get them from modules instead of hard coding in wificond. Co-authored-by: Ziwen Xiao <Ziwen.Xiao@sony.com> Test: manual test Bug: 208172490 Change-Id: I27100d529f32a724ae948e9ab1c7e9325a0e0374
2023-02-08[automerger skipped] Merge TQ1A.230205.002 am: dd999399bb -s ours am: ↵Xin Li
c181f59ace -s ours am: 75251cc522 -s ours am skip reason: Merged-In Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 with SHA-1 f43bf30ead is already in history Original change: https://android-review.googlesource.com/c/platform/system/connectivity/wificond/+/2424080 Change-Id: I9098736318de7a41661fb637f59cca235c80e7d2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08[automerger skipped] Merge TQ1A.230205.002 am: dd999399bb -s ours am: ↵Xin Li
c181f59ace -s ours am skip reason: Merged-In Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 with SHA-1 f43bf30ead is already in history Original change: https://android-review.googlesource.com/c/platform/system/connectivity/wificond/+/2424080 Change-Id: Ic8f2b97855d7a3150a705abebc77e3baaeae2d9f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08[automerger skipped] Merge TQ1A.230205.002 am: dd999399bb -s oursandroid-u-beta-1-gplXin Li
am skip reason: Merged-In Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 with SHA-1 f43bf30ead is already in history Original change: https://android-review.googlesource.com/c/platform/system/connectivity/wificond/+/2424080 Change-Id: I8bd501fe908d87923195fb8889d7063f0b292bbf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-06Merge TQ1A.230205.002Xin Li
Bug: 263898609 Merged-In: Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 Change-Id: I8fc30ce934dcdcf45393fa50e3a4a650fa47c9f0
2023-01-24Merge "Add vendor ies in scan probe req"Shuibing Dai
2023-01-19Add vendor ies in scan probe reqShuibing Dai
Bug: 258285219 Test: manually verified the vendor ies in sniffer probe req pkt. Change-Id: I280e0e122d250d8f3aa749a9e7cec6d75b2c3f8f
2023-01-18Merge "Allow failure to register keystore service"Devin Moore
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
df400d2f12 -s ours am: d15b3ef4d7 -s ours am skip reason: Merged-In Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 with SHA-1 f43bf30ead is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20948821 Change-Id: I2da68bb45858afd684cf8aa0dfb2eabd6e0c2117 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
df400d2f12 -s ours am skip reason: Merged-In Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 with SHA-1 f43bf30ead is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20948821 Change-Id: Ic796dcc69f3ad63826d8b1703be13be6a9b93906 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11Merge tm-qpr-dev-plus-aosp-without-vendor@9467136Xin Li
Bug: 264720040 Merged-In: Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 Change-Id: I3d61fb85c91db59022c796672c2d09bfaa95f732
2023-01-11Allow failure to register keystore serviceDevin Moore
The HIDL keystore service is deprecated and devices targeting framework compatibility matrix level 8 or later will prevent it from being registered. Test: boot cuttlefish and check for info log Bug: 205764502 Change-Id: I795eb6fb7ef72e316b8dfba4d2b8b4f27613678a
2022-12-15Provide Scan failure reason codes to applicationSunil Ravi
Bug: 239210046 Test: compile Change-Id: I1ef3e42f5bf83d8bd1f69b76aba6f2442252864b
2022-12-14Merge cherrypicks of ['ag/20330542'] into tm-qpr1-release.android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-releaseAndroid Build Coastguard Worker
Change-Id: Ib3e2b47879496b022977de3c46342afbfd9f1137
2022-12-14Use sp<T>::make to create the sp pointer for EventLoopCallbackChris Ye
In wificond, EventLoopCallback is derrived from MessageHandler, which is derrived from RefBase, so we should be using sp<T>::make to create the smart pointer so the incStrong will occur on the Refbase object. Bug: 243362981 Test: Flash hwasan build and do wificond scan, do not observe crash. Merged-In: Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 Change-Id: Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 (cherry picked from commit 77798e915cb1091111c511b41ede98d11858e23c) Merged-In: Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6
2022-12-12Snap for 9395132 from edc11950a1b293b1a4a41bc4366360f1dd489290 to ↵aml_adb_331610000Android Build Coastguard Worker
mainline-adbd-release Change-Id: Ice14e0b4d8c798eed57bcce8631fff3a959ad6b4
2022-12-12Merge "[automerger skipped] Merge Android 13 QPR1 am: 383fc759bf -s ours" ↵Automerger Merge Worker
into stage-aosp-master am: f2a114af90 -s ours am: db8bac4efe -s ours am skip reason: Merged-In I06f680220671171481f850735f6093799466eea4 with SHA-1 3d38e198cf is already in history Original change: https://android-review.googlesource.com/c/platform/system/connectivity/wificond/+/2338416 Change-Id: Idcd5608d53e1bc9a7b21505d4764e7fc939fdbf3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12[automerger skipped] Merge Android 13 QPR1 am: 383fc759bf -s ours am: ↵Xin Li
9213c517ef -s ours am: c31d8a782a -s ours am skip reason: Merged-In I06f680220671171481f850735f6093799466eea4 with SHA-1 3d38e198cf is already in history Original change: https://android-review.googlesource.com/c/platform/system/connectivity/wificond/+/2338416 Change-Id: I74c8487dd00437d8b29bea2ebd4d1f4917c4adac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12[automerger skipped] Merge Android 13 QPR1 am: 383fc759bf -s ours am: ↵Xin Li
e12b15ca9f -s ours am: 0c08180526 -s ours am skip reason: Merged-In I06f680220671171481f850735f6093799466eea4 with SHA-1 3d38e198cf is already in history Original change: https://android-review.googlesource.com/c/platform/system/connectivity/wificond/+/2338416 Change-Id: Iac1ea59e078d9589608695c725adfab71cfe8c43 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10Merge "[automerger skipped] Merge Android 13 QPR1 am: 383fc759bf -s ours" ↵Automerger Merge Worker
into stage-aosp-master am: f2a114af90 -s ours am skip reason: Merged-In I06f680220671171481f850735f6093799466eea4 with SHA-1 3d38e198cf is already in history Original change: https://android-review.googlesource.com/c/platform/system/connectivity/wificond/+/2338416 Change-Id: I2081ec6cf36eb00f6fd5e7e42822403d16ea9501 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge Android 13 QPR1 am: 383fc759bf -s ours am: ↵Xin Li
9213c517ef -s ours am skip reason: Merged-In I06f680220671171481f850735f6093799466eea4 with SHA-1 3d38e198cf is already in history Original change: https://android-review.googlesource.com/c/platform/system/connectivity/wificond/+/2338416 Change-Id: I7c50aeb21537abbafd88cd62da888cad2205242c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge Android 13 QPR1 am: 383fc759bf -s ours am: ↵Xin Li
e12b15ca9f -s ours am skip reason: Merged-In I06f680220671171481f850735f6093799466eea4 with SHA-1 3d38e198cf is already in history Original change: https://android-review.googlesource.com/c/platform/system/connectivity/wificond/+/2338416 Change-Id: Id23e457753b7b16ce28a264aed908d90814ef92a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Merge "[automerger skipped] Merge Android 13 QPR1 am: 383fc759bf -s ours" ↵Automerger Merge Worker
into stage-aosp-master
2022-12-09[automerger skipped] Merge Android 13 QPR1 am: 383fc759bf -s oursXin Li
am skip reason: Merged-In I06f680220671171481f850735f6093799466eea4 with SHA-1 3d38e198cf is already in history Original change: https://android-review.googlesource.com/c/platform/system/connectivity/wificond/+/2338416 Change-Id: I350c0dafb77978415323b922bc9bd4dab5b55955 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09[automerger skipped] Merge Android 13 QPR1 am: 383fc759bf -s oursXin Li
am skip reason: Merged-In I06f680220671171481f850735f6093799466eea4 with SHA-1 3d38e198cf is already in history Original change: https://android-review.googlesource.com/c/platform/system/connectivity/wificond/+/2338416 Change-Id: I6c73832975de358c58ec3fcb1ad147b2b333c0b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Merge Android 13 QPR1main-16k-with-phonesXin Li
Bug: 261731544 Merged-In: I06f680220671171481f850735f6093799466eea4 Change-Id: I5c6f572975b1c1fcb4ae0d7f1f0013f272f5bbbc
2022-11-29[automerger skipped] Merge "Use sp<T>::make to create the sp pointer for ↵TreeHugger Robot
EventLoopCallback" into sc-v2-dev am: 594fbc0702 -s ours am: 6521b8cb11 -s ours am: e6c4c7b8b9 -s ours am: c6d10c85db -s ours am: 21f7627f23 -s ours am skip reason: Merged-In Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 with SHA-1 73bb787e6e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20330539 Change-Id: Ie31f40a28b14f0ee3bb49b770f5daa9feffa9e9d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29[automerger skipped] Use sp<T>::make to create the sp pointer for ↵Chris Ye
EventLoopCallback am: f43bf30ead -s ours am: fa92d8dd28 -s ours am: f39c721a14 -s ours am: d5299eaa87 -s ours am: 2099d7dc3b -s ours am skip reason: Merged-In Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 with SHA-1 73bb787e6e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20330539 Change-Id: I9b072e45fe105b4cd26ffb2a7d97ef147ff0971a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29Merge "[conflict] [automerge] Use sp<T>::make to create the sp pointer for ↵TreeHugger Robot
EventLoopCallback 2p: a9de1657e9 am: 3081d564cd am: b0302d8c00" into tm-dev am: bfed347796 am: a444326dfc am: 6f7e64030e am: b43d0ba939 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20536681 Change-Id: I0ceac5b5b4af2ee9eb4ce5b67ee66313d065be0d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29[automerger skipped] Merge "Use sp<T>::make to create the sp pointer for ↵TreeHugger Robot
EventLoopCallback" into sc-v2-dev am: 594fbc0702 -s ours am: 6521b8cb11 -s ours am: e6c4c7b8b9 -s ours am: c6d10c85db -s ours am skip reason: Merged-In Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 with SHA-1 73bb787e6e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20330539 Change-Id: I2355bd32e3501f8c52846ecf6a5971747be89e4e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29[automerger skipped] Use sp<T>::make to create the sp pointer for ↵Chris Ye
EventLoopCallback am: f43bf30ead -s ours am: fa92d8dd28 -s ours am: f39c721a14 -s ours am: d5299eaa87 -s ours am skip reason: Merged-In Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 with SHA-1 73bb787e6e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20330539 Change-Id: I84e86bfe7a036c93a84d83d3aa9ee388ec22ca85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29Merge "[conflict] [automerge] Use sp<T>::make to create the sp pointer for ↵TreeHugger Robot
EventLoopCallback 2p: a9de1657e9 am: 3081d564cd am: b0302d8c00" into tm-dev am: bfed347796 am: a444326dfc am: 6f7e64030e Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20536681 Change-Id: I848321a45e432c0c2a7e4469b5693e0e4cf2de18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29[automerger skipped] Merge "Use sp<T>::make to create the sp pointer for ↵android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseTreeHugger Robot
EventLoopCallback" into sc-v2-dev am: 594fbc0702 -s ours am: 6521b8cb11 -s ours am: e6c4c7b8b9 -s ours am skip reason: Merged-In Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 with SHA-1 73bb787e6e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20330539 Change-Id: Id4ec951ef9ae1be2def3c50d877078e97decb13a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29[automerger skipped] Use sp<T>::make to create the sp pointer for ↵Chris Ye
EventLoopCallback am: f43bf30ead -s ours am: fa92d8dd28 -s ours am: f39c721a14 -s ours am skip reason: Merged-In Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 with SHA-1 73bb787e6e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20330539 Change-Id: Id5b58635597b5d1bbfcd12ffe2b1e661e87bd4e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29Merge "[conflict] [automerge] Use sp<T>::make to create the sp pointer for ↵TreeHugger Robot
EventLoopCallback 2p: a9de1657e9 am: 3081d564cd am: b0302d8c00" into tm-dev am: bfed347796 am: a444326dfc Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20536681 Change-Id: Ib3bf149519b065e53d0e88a63304e51f06ef486b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29[automerger skipped] Merge "Use sp<T>::make to create the sp pointer for ↵TreeHugger Robot
EventLoopCallback" into sc-v2-dev am: 594fbc0702 -s ours am: 6521b8cb11 -s ours am: edc11950a1 -s ours am skip reason: Merged-In Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 with SHA-1 73bb787e6e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20330539 Change-Id: I376f422a9d2b6db5877f056746fba6a23f75ad85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29[automerger skipped] Use sp<T>::make to create the sp pointer for ↵Chris Ye
EventLoopCallback am: f43bf30ead -s ours am: fa92d8dd28 -s ours am: b574a20c30 -s ours am skip reason: Merged-In Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 with SHA-1 73bb787e6e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20330539 Change-Id: Ib5d674fb2c27b696bb94a63a2dad3d6a246a0549 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29Merge "[conflict] [automerge] Use sp<T>::make to create the sp pointer for ↵TreeHugger Robot
EventLoopCallback 2p: a9de1657e9 am: 3081d564cd am: b0302d8c00" into tm-dev am: bfed347796 am: 309b5bf3cc Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20536681 Change-Id: I09e54ce82dabf10277d797d93321c52cb6dbedf8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29[automerger skipped] Merge "Use sp<T>::make to create the sp pointer for ↵TreeHugger Robot
EventLoopCallback" into sc-v2-dev am: 594fbc0702 -s ours am: 6521b8cb11 -s ours am skip reason: Merged-In Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 with SHA-1 73bb787e6e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20330539 Change-Id: Ie366c27c586a5b07ac006a48be739befac1ed32f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29[automerger skipped] Use sp<T>::make to create the sp pointer for ↵Chris Ye
EventLoopCallback am: f43bf30ead -s ours am: fa92d8dd28 -s ours am skip reason: Merged-In Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 with SHA-1 73bb787e6e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20330539 Change-Id: I1feb0435a5bfc9a6b13558ba6d98515ca14ff431 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29Merge "[conflict] [automerge] Use sp<T>::make to create the sp pointer for ↵TreeHugger Robot
EventLoopCallback 2p: a9de1657e9 am: 3081d564cd am: b0302d8c00" into tm-dev am: bfed347796 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20536681 Change-Id: I7ea0382eecb53cba57b575d9183c7a5b65c6000c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29[automerger skipped] Merge "Use sp<T>::make to create the sp pointer for ↵TreeHugger Robot
EventLoopCallback" into sc-v2-dev am: 594fbc0702 -s ours am: 6521b8cb11 -s ours am skip reason: Merged-In Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 with SHA-1 73bb787e6e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20330539 Change-Id: I205a24b17c7d2470fa5e19ea2fa932891ebc1714 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29[automerger skipped] Use sp<T>::make to create the sp pointer for ↵Chris Ye
EventLoopCallback am: f43bf30ead -s ours am: fa92d8dd28 -s ours am skip reason: Merged-In Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 with SHA-1 73bb787e6e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20330539 Change-Id: I9a3b37c779670cb2490367466c7774f07f3feaaf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29Merge "[conflict] [automerge] Use sp<T>::make to create the sp pointer for ↵TreeHugger Robot
EventLoopCallback 2p: a9de1657e9 am: 3081d564cd am: b0302d8c00" into tm-dev am: bfed347796 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20536681 Change-Id: I78924a7bda44f40e7e58b453889c9c1a7d6ffc02 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29[automerger skipped] Merge "Use sp<T>::make to create the sp pointer for ↵TreeHugger Robot
EventLoopCallback" into sc-v2-dev am: 594fbc0702 -s ours am skip reason: Merged-In Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 with SHA-1 73bb787e6e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20330539 Change-Id: I12024c07801a9aa942a103ff1043f8bc7a91b230 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29[automerger skipped] Use sp<T>::make to create the sp pointer for ↵Chris Ye
EventLoopCallback am: f43bf30ead -s ours am skip reason: Merged-In Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6 with SHA-1 73bb787e6e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20330539 Change-Id: If4ca2c2b264120d8bf646343fdf5d6e82681ff96 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29Merge "[conflict] [automerge] Use sp<T>::make to create the sp pointer for ↵TreeHugger Robot
EventLoopCallback 2p: a9de1657e9 am: 3081d564cd am: b0302d8c00" into tm-dev
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 23:25:48 +0000