| commit | c2063943e3cbb51ce31292112764bcf2d8bb56d8 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Jan 30 21:35:24 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jan 30 21:35:24 2023 +0000 |
| tree | b9de80425837112a0f7f100547f1f8b75c6be314 | |
| parent | 3c939584ff091a6c8f06730c1ec085477aba4946 [diff] | |
| parent | 210f3b234e48f353053dc8e0648cded926f60caf [diff] |
Merge "ethernet: prevent provisioning failure loop" am: 210f3b234e Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2388903 Change-Id: Iea264e2bfb8a468adf4c96a1373ce5607f47cd4b 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(); }