summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2015-05-12 19:13:36 -0700
committerSvetoslav <svetoslavganov@google.com>2015-05-18 15:14:24 -0700
commit408abf7f1bec3253675d0225300d7ee39481d286 (patch)
tree53eabf6d9576627fb8afebc3f70c6adfc1745a2a /wifi
parentbeda8613ad7bc01affa17857faed04d9589db34c (diff)
downloadframeworks_base-408abf7f1bec3253675d0225300d7ee39481d286.zip
frameworks_base-408abf7f1bec3253675d0225300d7ee39481d286.tar.gz
frameworks_base-408abf7f1bec3253675d0225300d7ee39481d286.tar.bz2
Do not report WiFi and Bluetooth MAC addresses - framework.
As a part of the new runtime permissions work we are limiting the PII apps can access. BT and WiFi MAC addresses are PII and based on our research there is no valid use case for app dev to get these addresses aside of user tracking which we are trying to limit. bug:21078858 Change-Id: Ib48223b272c0fd4f5c36acc889d4f44df204b309
Diffstat (limited to 'wifi')
-rw-r--r--wifi/java/android/net/wifi/WifiInfo.java10
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