| commit | 28edb662623c159c57267d3c95ba36e147c4fea4 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Jan 30 21:55:38 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jan 30 21:55:38 2023 +0000 |
| tree | 91ece2f0a77a4a8381370acba4f2140db8c19b9b | |
| parent | c2309adfc8db21531e7f7335f5af4773271c7dae [diff] | |
| parent | c654c8d11fdbc2e4fe12577e2b3127b585c837da [diff] |
Merge "ethernet: prevent provisioning failure loop" am: 210f3b234e am: c654c8d11f Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2388903 Change-Id: Ie256b98fa22f21ad0107d5df35ee63b74fd3bda1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java index 51683de..60485f1 100644 --- a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java +++ b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
@@ -657,7 +657,17 @@ } void restart() { - if (DBG) Log.d(TAG, "reconnecting Ethernet"); + if (DBG) Log.d(TAG, "restart IpClient"); + + if (mIpClient == null) { + // If restart() is called from a provisioning failure, it is + // possible that link disappeared in the meantime. In that + // case, stop() has already been called and IpClient should not + // get restarted to prevent a provisioning failure loop. + Log.i(TAG, String.format("restart() was called on stopped interface %s", name)); + return; + } + stop(); start(); }