summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 715bfe63d7 -s ours ↵aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000android13-mainline-tzdata4-releaseaml_tz4_332714010Xin Li
am: 85d2768300 -s ours am: c277b08f4f -s ours am skip reason: Merged-In Ia135d491ac5331ea8067fe7f64ad28df5c8eadb9 with SHA-1 f652fc08a3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/17543437 Change-Id: Ieaf200cea8a7968831c540d3da54463fbb23964b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 715bfe63d7 -s ours ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010main-16kandroid13-frc-odp-releaseandroid13-devXin Li
am: 85d2768300 -s ours am skip reason: Merged-In Ia135d491ac5331ea8067fe7f64ad28df5c8eadb9 with SHA-1 f652fc08a3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/17543437 Change-Id: Ic6915d38e9c866712ecae5f24f46b46ca71a7000 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 715bfe63d7 -s oursXin Li
am skip reason: Merged-In Ia135d491ac5331ea8067fe7f64ad28df5c8eadb9 with SHA-1 f652fc08a3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/17543437 Change-Id: I7f1b0b6a59cab2d38b2f5d684d2be5d0817bb79a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge Android 12 QPR3 ab/8391262Xin Li
Bug: 226662282 Merged-In: Ia135d491ac5331ea8067fe7f64ad28df5c8eadb9 Change-Id: I70318f1ecb3816e445b1c29f0041f03ec67e651a
2022-03-31[automerger skipped] Move f/o/n/ethernet to p/m/Connectivity am: 01788f8ae9 ↵Patrick Rohr
-s ours am: a583c1ac45 -s ours am: f652fc08a3 -s ours am: c3bbc6d3ea -s ours am skip reason: Merged-In Ifa19b4476ec8825571f1107c7796dcbb116d7862 with SHA-1 ae6719e32b is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2050874 Change-Id: I2213c613d27d702fe71ae5f8b06e170285b7ca06 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31[automerger skipped] Move f/o/n/ethernet to p/m/Connectivity am: 01788f8ae9 ↵Patrick Rohr
-s ours am: a583c1ac45 -s ours am: f652fc08a3 -s ours am skip reason: Merged-In Ifa19b4476ec8825571f1107c7796dcbb116d7862 with SHA-1 ae6719e32b is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2050874 Change-Id: If4980819f96f28b2974a382c32455112cd679566 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31[automerger skipped] Move f/o/n/ethernet to p/m/Connectivity am: 01788f8ae9 ↵Patrick Rohr
-s ours am: a583c1ac45 -s ours am skip reason: Merged-In Ifa19b4476ec8825571f1107c7796dcbb116d7862 with SHA-1 ae6719e32b is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2050874 Change-Id: Ia135d491ac5331ea8067fe7f64ad28df5c8eadb9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31[automerger skipped] Move f/o/n/ethernet to p/m/Connectivity am: 01788f8ae9 ↵Patrick Rohr
-s ours am skip reason: Merged-In Ifa19b4476ec8825571f1107c7796dcbb116d7862 with SHA-1 ae6719e32b is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2050874 Change-Id: I30b5aaac5b26e5f52f74b304ec44c7f49a91b6da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31[automerger skipped] Move f/o/n/ethernet to p/m/Connectivity am: 9fe3c97364 ↵Patrick Rohr
am: 6ca86e0772 -s ours am: b1a566ba81 -s ours am skip reason: Merged-In I4dd5a6ccd3294af838abcfc5ca08b76f1c002155 with SHA-1 902d48b848 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/17505205 Change-Id: I4c26af518db14113cc45794d4f5ab273c12e8d43 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31[automerger skipped] Move f/o/n/ethernet to p/m/Connectivity am: 9fe3c97364 ↵Patrick Rohr
am: 6ca86e0772 -s ours am skip reason: Merged-In I4dd5a6ccd3294af838abcfc5ca08b76f1c002155 with SHA-1 902d48b848 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/17505205 Change-Id: Icef4aa26d252ecc5ea34b2b5b93a5101cdc1513f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31Move f/o/n/ethernet to p/m/Connectivity am: 9fe3c97364Patrick Rohr
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/17505205 Change-Id: I6ffdff3c576a12149d0c391a5df8b732d1818824 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31Move f/o/n/ethernet to p/m/Connectivity am: e352d78b8ePatrick Rohr
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/17505203 Change-Id: I7c0dc823d07bf49c8d47ffe3f16b208e3bbf519d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31Move f/o/n/ethernet to p/m/ConnectivityPatrick Rohr
Test: TH Bug: 222234190 Merged-In: Ifa19b4476ec8825571f1107c7796dcbb116d7862 Change-Id: Iea43a76d84002a5a587fa735b692d8b6ce6fd12e
2022-03-31Move f/o/n/ethernet to p/m/ConnectivityPatrick Rohr
Test: TH Bug: 222234190 Merged-In: I4dd5a6ccd3294af838abcfc5ca08b76f1c002155 Change-Id: Iea43a76d84002a5a587fa735b692d8b6ce6fd12e
2022-03-31Move f/o/n/ethernet to p/m/ConnectivityPatrick Rohr
Test: TH Bug: 222234190 Merged-In: I2a9b6d3141a6ff197093a607d9eeb0e7831f20ba Change-Id: Iea43a76d84002a5a587fa735b692d8b6ce6fd12e
2022-03-24Merge "Fixing multithreading issues in Ethernet Factory" am: 67407ec685 am: ↵Patrick Rohr
ae6719e32b am: bad3d2ddae am: 902d48b848 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2027706 Change-Id: I6603a8d40254a066bf66ccc1c38fe030f75667ba
2022-03-24Merge "Fixing multithreading issues in Ethernet Factory" am: 67407ec685 am: ↵Patrick Rohr
ae6719e32b am: bad3d2ddae Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2027706 Change-Id: I4dd5a6ccd3294af838abcfc5ca08b76f1c002155
2022-03-24Merge "Fixing multithreading issues in Ethernet Factory" am: 67407ec685 am: ↵Patrick Rohr
ae6719e32b Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2027706 Change-Id: I0f4828f63d9af663acabcf93ac47f190b2f9a26d
2022-03-24Merge "Fixing multithreading issues in Ethernet Factory" am: 67407ec685Patrick Rohr
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2027706 Change-Id: Ifa19b4476ec8825571f1107c7796dcbb116d7862
2022-03-24Merge "Fixing multithreading issues in Ethernet Factory"Patrick Rohr
2022-03-24[automerger skipped] Add getInterfaceList API implementation in Ethernet ↵Xiao Ma
service. am: 260521db42 am: b554c7f34a am: 5054701c51 -s ours am: d661d5bd9d -s ours am skip reason: Merged-In I8eeb2cd211c6a2ec6bc997c5e18995b585c6118a with SHA-1 613c01dacc is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2029725 Change-Id: I001c7251b99fa73078b5d1198f4af6a557b4dddf
2022-03-24[automerger skipped] Add getInterfaceList API implementation in Ethernet ↵Xiao Ma
service. am: 260521db42 am: b554c7f34a am: 5054701c51 -s ours am skip reason: Merged-In I8eeb2cd211c6a2ec6bc997c5e18995b585c6118a with SHA-1 613c01dacc is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2029725 Change-Id: Ia3b0e31bf2cc954ce92eea9c3ad5e02207c85984
2022-03-24Add getInterfaceList API implementation in Ethernet service. am: 260521db42 ↵Xiao Ma
am: b554c7f34a Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2029725 Change-Id: I7cb7ee51f75f84a969eb8b9fb09755de544ce685
2022-03-24Add getInterfaceList API implementation in Ethernet service. am: 260521db42Xiao Ma
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2029725 Change-Id: Id8eba7b7f968c04f233fe8e3629a236aab9e2bc9
2022-03-23[automerger skipped] Add global change ethernet state API am: 61566c7d1a am: ↵markchien
9d1cc7aa97 am: 7e3edf8108 -s ours am: 0560279826 -s ours am skip reason: Merged-In Iee4b48511ff668a2a7df90fd9bfe563d7ff23940 with SHA-1 8a4c9c3564 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2027234 Change-Id: Iadd1496d5acac178581b9a8590ba1bcca4b8e1ad
2022-03-23[automerger skipped] Add global change ethernet state API am: 61566c7d1a am: ↵markchien
9d1cc7aa97 am: 7e3edf8108 -s ours am skip reason: Merged-In Iee4b48511ff668a2a7df90fd9bfe563d7ff23940 with SHA-1 8a4c9c3564 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2027234 Change-Id: Ieeac7f21061f95798097951069182f5f09b09c6b
2022-03-23Add global change ethernet state API am: 61566c7d1a am: 9d1cc7aa97markchien
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2027234 Change-Id: I122a1eda9e9328e0f1ddcfe1e546b8fe3cc33d75
2022-03-23Add global change ethernet state API am: 61566c7d1amarkchien
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2027234 Change-Id: I03e8182db48c7adf327267ebcf1c2d649ee1fa2f
2022-03-23Add getInterfaceList API implementation in Ethernet service.Xiao Ma
Bug: 171872016 Test: m Merged-In: I8eeb2cd211c6a2ec6bc997c5e18995b585c6118a Change-Id: Ic36d26be7dae5fd3f72abce3cea1ee845813a6e5
2022-03-23Add global change ethernet state APImarkchien
Provide a new API to enable or disable ethernet. Also have a listener for call to check whether enable state is sucessful. Bug: 171872016 Test: atest EthernetServiceTests Change-Id: Iee4b48511ff668a2a7df90fd9bfe563d7ff23940 Merged-In: Iee4b48511ff668a2a7df90fd9bfe563d7ff23940
2022-03-23[automerger skipped] Change network management listener to outcome receiver ↵Patrick Rohr
am: ee9bfdd7ad am: 6cfe9f9115 -s ours am: b0e17e5c4e -s ours am skip reason: Merged-In Iee4b48511ff668a2a7df90fd9bfe563d7ff23940 with SHA-1 8a4c9c3564 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/17321724 Change-Id: Ib43976d09e82aa82c214d08ba695dc797a3511c2
2022-03-23[automerger skipped] Change network management listener to outcome receiver ↵Patrick Rohr
am: ee9bfdd7ad am: 6cfe9f9115 -s ours am skip reason: Merged-In Iee4b48511ff668a2a7df90fd9bfe563d7ff23940 with SHA-1 8a4c9c3564 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/17321724 Change-Id: I01095bb474c8fa89d05709abe763c62790933866
2022-03-23Change network management listener to outcome receiver am: ee9bfdd7adPatrick Rohr
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/17321724 Change-Id: Id31b60cb6d60a86fafef3f095cf2e481e60e3ff7
2022-03-23Change network management listener to outcome receiverPatrick Rohr
Adopts new API according to API review feedback. The outcome receiver can later be removed from most of the ethernet code; in a perfect world, a result can be generated and an exception captured directly from EthernetServiceImpl. This will greatly simplify the current implementation. CP note: the Merged-In ID is not the actual Change-Id of this change in tm-dev. This change was originally merged in aosp, but was subsequently reverted and cherry-picked into tm-dev. The cherry-pick falsely reused the Change-Id of the (now reverted) original change. This causes automerger to skip this change on all branches between aosp-master and tm-dev when the correct Merged-In ID is used. Therefore, the Merged-In ID listed is the Change-Id of an unrelated change that is present in tm-dev but not aosp-master. Bug: 220017952 Test: atest EthernetServiceTests Ignore-AOSP-First: CP to make automerger happy. Merged-In: Iee4b48511ff668a2a7df90fd9bfe563d7ff23940 Change-Id: Id8fadfed9fcfd22f04f6d7c3460b5956e571e01f
2022-03-22Fixing multithreading issues in Ethernet FactoryJames Mattis
IP client callbacks could be executed updating the state of an ethernet interface even if they were no longer the callbacks for the currently active interface. This can happen as IP client callbacks were being called from a thread separate from ethernet. Bug: 224890356 Test: atest EthernetServiceTests atest CtsNetTestCasesLatestSdk :android.net.cts.EthernetManagerTest --iterations 30 Change-Id: I238cb75caa01472bccc79db5bafa82bccdaeba52
2022-03-22[automerger skipped] Merge "Revert "Revert "Change network management ↵Patrick Rohr
listener to outcome re..."" am: 8127134033 -s ours am: 8b91f529e7 -s ours am: 95d92f55f7 -s ours am: f02d5cbf5b -s ours am skip reason: Merged-In Id8fadfed9fcfd22f04f6d7c3460b5956e571e01f with SHA-1 dedbb58eed is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2031103 Change-Id: I572a42f30020a810b729458373a507b4109e895d
2022-03-22[automerger skipped] Revert "Revert "Change network management listener to ↵Patrick Rohr
outcome re..." am: e8fdf6ae92 -s ours am: 9934347880 -s ours am: 13aa59898a -s ours am: 7227d338b4 -s ours am skip reason: Merged-In Id8fadfed9fcfd22f04f6d7c3460b5956e571e01f with SHA-1 dedbb58eed is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2031103 Change-Id: Ie95164e583797e018b633bac8ff1a31724bb2a90
2022-03-22[automerger skipped] Merge "Revert "Revert "Change network management ↵Patrick Rohr
listener to outcome re..."" am: 8127134033 -s ours am: 8b91f529e7 -s ours am: 95d92f55f7 -s ours am skip reason: Merged-In Id8fadfed9fcfd22f04f6d7c3460b5956e571e01f with SHA-1 dedbb58eed is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2031103 Change-Id: I48cc6ef28a9cbeb8d23d7ba42277735c38ae32f8
2022-03-22[automerger skipped] Revert "Revert "Change network management listener to ↵Patrick Rohr
outcome re..." am: e8fdf6ae92 -s ours am: 9934347880 -s ours am: 13aa59898a -s ours am skip reason: Merged-In Id8fadfed9fcfd22f04f6d7c3460b5956e571e01f with SHA-1 dedbb58eed is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2031103 Change-Id: I912b449dfbc3b0b8e176a446fb149d3532fe6893
2022-03-22[automerger skipped] Merge "Revert "Revert "Change network management ↵Patrick Rohr
listener to outcome re..."" am: 8127134033 -s ours am: 8b91f529e7 -s ours am skip reason: Merged-In Id8fadfed9fcfd22f04f6d7c3460b5956e571e01f with SHA-1 dedbb58eed is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2031103 Change-Id: I8e1963c8be0ab29558e6f74c20c64c4be8a5f9c2
2022-03-22[automerger skipped] Revert "Revert "Change network management listener to ↵Patrick Rohr
outcome re..." am: e8fdf6ae92 -s ours am: 9934347880 -s ours am skip reason: Merged-In Id8fadfed9fcfd22f04f6d7c3460b5956e571e01f with SHA-1 dedbb58eed is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2031103 Change-Id: I2d7eacf77c834433c3da48f564692cf7f2ae32aa
2022-03-22[automerger skipped] Merge "Revert "Revert "Change network management ↵Patrick Rohr
listener to outcome re..."" am: 8127134033 -s ours am skip reason: Merged-In Id8fadfed9fcfd22f04f6d7c3460b5956e571e01f with SHA-1 dedbb58eed is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2031103 Change-Id: If2127056ebb0a4080d39d45ede511c42a731ddfe
2022-03-22[automerger skipped] Revert "Revert "Change network management listener to ↵Patrick Rohr
outcome re..." am: e8fdf6ae92 -s ours am skip reason: Merged-In Id8fadfed9fcfd22f04f6d7c3460b5956e571e01f with SHA-1 dedbb58eed is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2031103 Change-Id: I7f80182202ac42ff67da99596c31696da278fca5
2022-03-22Merge "Revert "Revert "Change network management listener to outcome re...""Patrick Rohr
2022-03-19Merge "Cleaning EthernetNetworkFactoryTest Unprovisioned" am: d9c8ae8d14 am: ↵Treehugger Robot
3be73388e7 am: be4b7d616c am: 64b87d2d58 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2017355 Change-Id: I34924dce505b61dc7f344d4b37ac69f39447a0ed
2022-03-19Merge "Cleaning EthernetNetworkFactoryTest Unprovisioned" am: d9c8ae8d14 am: ↵Treehugger Robot
3be73388e7 am: be4b7d616c Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2017355 Change-Id: Ie463a2b48e0b59386ca24535fc0b1396ab2a82e3
2022-03-19Merge "Cleaning EthernetNetworkFactoryTest Unprovisioned" am: d9c8ae8d14 am: ↵Treehugger Robot
3be73388e7 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2017355 Change-Id: Ieb945164c7d245195ea653b3bb4b6f16f92da9cb
2022-03-19Merge "Cleaning EthernetNetworkFactoryTest Unprovisioned" am: d9c8ae8d14Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2017355 Change-Id: I3caa708a007760ccd25115860be55c0bc5158565
2022-03-19Merge "Cleaning EthernetNetworkFactoryTest Unprovisioned"Treehugger Robot
2022-03-18Add getInterfaceList API implementation in Ethernet service. am: 613c01daccXiao Ma
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/17244760 Change-Id: I0f6893e6c47eb291449d7179dbd7c589a216bc78
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 20:31:22 +0000