From 93d4c23facfabaa96eacc8bcd7ede61586f9887f Mon Sep 17 00:00:00 2001 From: Pierre Imai Date: Mon, 8 Feb 2016 16:01:40 +0900 Subject: [PATCH] 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 98f9c2c23bd122d0d2b5dea035ef0d5de986d09b) (cherry picked from commit 68902bc1df62ac41ab4e40850c1dd2b7de484b0c) Change-Id: I12ac6f511a6760ef26f489ba3a052ca3c125e5ee --- .../core/java/com/android/server/ConnectivityService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index d95e1a0c89..2fe4f56ae7 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -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;