summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Robert Greenwalt <rgreenwalt@google.com> 2014-08-17 19:14:31 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-08-17 19:14:31 +0000
commitd9da4f6fc1d0e8c554a87f8a9e4796bbfbf8fdea (patch)
tree035001577651907e10bbaf8128cceda3ac3abf3d
parent91bf9ffcc6311666a830463ef5145bad36a4b668 (diff)
parentcd3a2e578ded178c0f2a772fb31a980448430227 (diff)
am 8df154b1: am 8623d854: am 75258ebb: Merge "Fix a logic error so mtu works." into lmp-dev
* commit '8df154b134e0a04fa93cacbbfd3811cde34d8803': Fix a logic error so mtu works.
-rw-r--r--services/core/java/com/android/server/ConnectivityService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 02695c5216bc..92953cc2140a 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -1534,7 +1534,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
return;
}
- if (LinkProperties.isValidMtu(mtu, newLp.hasGlobalIPv6Address())) {
+ if (LinkProperties.isValidMtu(mtu, newLp.hasGlobalIPv6Address()) == false) {
loge("Unexpected mtu value: " + mtu + ", " + iface);
return;
}