From e3b646f25d8c96c43d28c72a98e2c90de9ae9273 Mon Sep 17 00:00:00 2001
From: Pierre Imai <imaipi@google.com>
Date: Mon, 8 Feb 2016 16:01:40 +0900
Subject: [PATCH] Silence the obnoxious MTU 0 error message that occur when no
 MTU is specified for a given network.

Bug: 10705136

(cherry picked from commit 07c53a35aeda587f887cfe4e1d0ccf0e4628f49c)

Change-Id: I89e2fdfbbfa981d435a2974422d9d9c009872d76
---
 .../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 4c90794555..4cd7d41ca9 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;