commit 36a05df3f33d9f48bdd4dff87189bb8025bf02c0
author Robert Greenwalt <rgreenwalt@google.com> Fri Aug 15 22:11:28 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 15 19:10:34 2014 +0000
tree 8ca27fbb9087d0999eee5dcc4bf9715e12f6d6f8
parent f2ceed8a54f6a837e2ffe6c9453785886c012c90
parent e714f1daa6a28749e2aaa5209b685b499afbe7a3

Merge "Configure MTU based on network MTU parameter" into lmp-dev

core/java/android/net/LinkProperties.java

diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java
index 8b64250..dcb2892 100644
--- a/core/java/android/net/LinkProperties.java
+++ b/core/java/android/net/LinkProperties.java
@@ -17,6 +17,7 @@
 package android.net;
 
 import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.net.ProxyInfo;
 import android.os.Parcelable;
 import android.os.Parcel;
@@ -128,7 +129,7 @@
      *
      * @return The interface name set for this link or {@code null}.
      */
-    public String getInterfaceName() {
+    public @Nullable String getInterfaceName() {
         return mIfaceName;
     }