Merge "[WIFI] Open up the getRandomizedMacAddress API"

2 files changed, 5 insertions, 1 deletions

diff --git a/api/current.txt b/api/current.txt
index 93e70b0d1ff5..07614caa4699 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -29743,6 +29743,7 @@ package android.net.wifi {
     ctor public WifiConfiguration();
     method public int describeContents();
     method public android.net.ProxyInfo getHttpProxy();
+    method public android.net.MacAddress getRandomizedMacAddress();
     method public boolean isPasspoint();
     method public void setHttpProxy(android.net.ProxyInfo);
     method public void writeToParcel(android.os.Parcel, int);
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index e019f282cd33..d2d711f10944 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -955,9 +955,12 @@ public class WifiConfiguration implements Parcelable {
     }
 
     /**
-     * @hide
      * Returns MAC address set to be the local randomized MAC address.
      * Does not guarantee that the returned address is valid for use.
+     * <p>
+     * Information is restricted to Device Owner, Profile Owner, and Carrier apps
+     * (which will only obtain addresses for configurations which they create). Other callers
+     * will receive a default "02:00:00:00:00:00" MAC address.
      */
     public @NonNull MacAddress getRandomizedMacAddress() {
         return mRandomizedMacAddress;