diff options
| author | 2017-12-05 10:30:31 +0900 | |
|---|---|---|
| committer | 2017-12-18 09:21:26 +0900 | |
| commit | 3f4848102c423faa41ab3ca5827be1e630686f60 (patch) | |
| tree | a1ee7df0080fe3dd35c0718974e6b9fd4533231c | |
| parent | 0d75603ea7da774d19bf5b015de42f374dad82ed (diff) | |
Expose the MacAddress class in the api
Test: built, flashed, $ runtest frameworks-net
Bug: 69390696
Change-Id: Ica5efdf5ffe8ad2500a87f574508a2bcd074b33d
Merged-In: Ica5efdf5ffe8ad2500a87f574508a2bcd074b33d
(cherry picked from commit d411cf61ed5b948aaf6f6234217d6c6999c35159)
| -rw-r--r-- | api/current.txt | 17 | ||||
| -rw-r--r-- | core/java/android/net/MacAddress.java | 2 |
2 files changed, 17 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index a07e1fdc5131..8389232351bc 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25749,6 +25749,23 @@ package android.net { enum_constant public static final android.net.LocalSocketAddress.Namespace RESERVED; } + public final class MacAddress implements android.os.Parcelable { + method public int addressType(); + method public int describeContents(); + method public static android.net.MacAddress fromBytes(byte[]); + method public static android.net.MacAddress fromString(java.lang.String); + method public boolean isLocallyAssigned(); + method public byte[] toByteArray(); + method public java.lang.String toSafeString(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.net.MacAddress BROADCAST_ADDRESS; + field public static final android.os.Parcelable.Creator<android.net.MacAddress> CREATOR; + field public static final int TYPE_BROADCAST = 3; // 0x3 + field public static final int TYPE_MULTICAST = 2; // 0x2 + field public static final int TYPE_UNICAST = 1; // 0x1 + field public static final int TYPE_UNKNOWN = 0; // 0x0 + } + public class MailTo { method public java.lang.String getBody(); method public java.lang.String getCc(); diff --git a/core/java/android/net/MacAddress.java b/core/java/android/net/MacAddress.java index 5620a627df7f..34588614fcc8 100644 --- a/core/java/android/net/MacAddress.java +++ b/core/java/android/net/MacAddress.java @@ -33,8 +33,6 @@ import java.util.Random; * * This class only supports 48 bits long addresses and does not support 64 bits long addresses. * Instances of this class are immutable. - * - * @hide */ public final class MacAddress implements Parcelable { |