Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d2740ca authored by Etan Cohen's avatar Etan Cohen Committed by Android (Google) Code Review
Browse files

Merge "[WIFI] Open up the getRandomizedMacAddress API"

parents 62cb5ce2 a914a2ef

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -29743,6 +29743,7 @@ package android.net.wifi { 
    ctor public WifiConfiguration();

    ctor public WifiConfiguration();

    method public int describeContents();

    method public int describeContents();

    method public android.net.ProxyInfo getHttpProxy();

    method public android.net.ProxyInfo getHttpProxy();

    method public android.net.MacAddress getRandomizedMacAddress();

    method public boolean isPasspoint();

    method public boolean isPasspoint();

    method public void setHttpProxy(android.net.ProxyInfo);

    method public void setHttpProxy(android.net.ProxyInfo);

    method public void writeToParcel(android.os.Parcel, int);

    method public void writeToParcel(android.os.Parcel, int);

wifi/java/android/net/wifi/WifiConfiguration.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -955,9 +955,12 @@ public class WifiConfiguration implements Parcelable { 
    }

    }





    /**

    /**

     * @hide

     * Returns MAC address set to be the local randomized MAC address.

     * Returns MAC address set to be the local randomized MAC address.

     * Does not guarantee that the returned address is valid for use.

     * 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() {

    public @NonNull MacAddress getRandomizedMacAddress() {

        return mRandomizedMacAddress;

        return mRandomizedMacAddress;