diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2015-05-19 00:13:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-19 00:13:22 +0000 |
| commit | f7b541ff749ec8336852ba781f1fa6f7abb3f6df (patch) | |
| tree | de32bafec441a451c5eeda456cade47e6d3b0f75 /wifi | |
| parent | 10e23977bd1aec6d833df1e8894f3a78eb0bd3cb (diff) | |
| parent | 408abf7f1bec3253675d0225300d7ee39481d286 (diff) | |
| download | frameworks_base-f7b541ff749ec8336852ba781f1fa6f7abb3f6df.zip frameworks_base-f7b541ff749ec8336852ba781f1fa6f7abb3f6df.tar.gz frameworks_base-f7b541ff749ec8336852ba781f1fa6f7abb3f6df.tar.bz2 | |
Merge "Do not report WiFi and Bluetooth MAC addresses - framework." into mnc-dev
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiInfo.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java index 75198e5..dbfd4ef 100644 --- a/wifi/java/android/net/wifi/WifiInfo.java +++ b/wifi/java/android/net/wifi/WifiInfo.java @@ -42,6 +42,14 @@ public class WifiInfo implements Parcelable { private static final EnumMap<SupplicantState, DetailedState> stateMap = new EnumMap<SupplicantState, DetailedState>(SupplicantState.class); + /** + * Default MAC address reported to a client that does not have the + * android.permission.LOCAL_MAC_ADDRESS permission. + * + * @hide + */ + public static final String DEFAULT_MAC_ADDRESS = "02:00:00:00:00:00"; + static { stateMap.put(SupplicantState.DISCONNECTED, DetailedState.DISCONNECTED); stateMap.put(SupplicantState.INTERFACE_DISABLED, DetailedState.DISCONNECTED); @@ -91,7 +99,7 @@ public class WifiInfo implements Parcelable { private int mFrequency; private InetAddress mIpAddress; - private String mMacAddress; + private String mMacAddress = DEFAULT_MAC_ADDRESS; /** * @hide |