diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2014-08-14 12:55:00 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@google.com> | 2014-08-14 22:42:27 +0000 |
| commit | 9da2f1e007268a42248a1778aa9b560e3ce3b704 (patch) | |
| tree | eade39aacd886d616490402fc812c13ca2a62812 /core/java/android/net | |
| parent | 9fde9a250fffc15c6bcdfc985de12c8646a9813c (diff) | |
| download | frameworks_base-9da2f1e007268a42248a1778aa9b560e3ce3b704.zip frameworks_base-9da2f1e007268a42248a1778aa9b560e3ce3b704.tar.gz frameworks_base-9da2f1e007268a42248a1778aa9b560e3ce3b704.tar.bz2 | |
Some networks may have null ifaces, I guess?
Seems like a bug further upstream, but guard ourselves against it
for now.
Bug: 17033841
Change-Id: Id0e5895c3389b63d4e34b1fb064efef8b72cd609
Diffstat (limited to 'core/java/android/net')
| -rw-r--r-- | core/java/android/net/LinkProperties.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java index 47b74ab..6160bc2 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; @@ -124,7 +125,7 @@ public final class LinkProperties implements Parcelable { * * @return The interface name set for this link or {@code null}. */ - public String getInterfaceName() { + public @Nullable String getInterfaceName() { return mIfaceName; } |