DO NOT MERGE: Silence the obnoxious MTU 0 error message that occur when no MTU is

specified for a given network.

Bug: 10705136

(cherry picked from commit 98f9c2c23b)

(cherry picked from commit 68902bc1df)

Change-Id: I12ac6f511a6760ef26f489ba3a052ca3c125e5ee
This commit is contained in:
Pierre Imai
2016-02-08 16:01:40 +09:00
committed by Lorenzo Colitti
parent 8dfc506c43
commit 93d4c23fac

View File

@@ -1804,11 +1804,14 @@ public class ConnectivityService extends IConnectivityManager.Stub
private void updateMtu(LinkProperties newLp, LinkProperties oldLp) {
final String iface = newLp.getInterfaceName();
final int mtu = newLp.getMtu();
if (oldLp == null && mtu == 0) {
// Silently ignore unset MTU value.
return;
}
if (oldLp != null && newLp.isIdenticalMtu(oldLp)) {
if (VDBG) log("identical MTU - not setting");
return;
}
if (LinkProperties.isValidMtu(mtu, newLp.hasGlobalIPv6Address()) == false) {
if (mtu != 0) loge("Unexpected mtu value: " + mtu + ", " + iface);
return;