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

Commit d5160fc1 authored by Oscar Shu's avatar Oscar Shu Committed by Android (Google) Code Review
Browse files

Merge "New API for enhanced MAC randomization"

parents 4d05f28d 45b78f9a

api/system-current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -7141,6 +7141,8 @@ package android.net.wifi { 
    field @Deprecated public static final int METERED_OVERRIDE_METERED = 1; // 0x1

    field @Deprecated public static final int METERED_OVERRIDE_METERED = 1; // 0x1

    field @Deprecated public static final int METERED_OVERRIDE_NONE = 0; // 0x0

    field @Deprecated public static final int METERED_OVERRIDE_NONE = 0; // 0x0

    field @Deprecated public static final int METERED_OVERRIDE_NOT_METERED = 2; // 0x2

    field @Deprecated public static final int METERED_OVERRIDE_NOT_METERED = 2; // 0x2

    field @Deprecated public static final int RANDOMIZATION_AUTO = 3; // 0x3

    field @Deprecated public static final int RANDOMIZATION_ENHANCED = 2; // 0x2

    field @Deprecated public static final int RANDOMIZATION_NONE = 0; // 0x0

    field @Deprecated public static final int RANDOMIZATION_NONE = 0; // 0x0

    field @Deprecated public static final int RANDOMIZATION_PERSISTENT = 1; // 0x1

    field @Deprecated public static final int RANDOMIZATION_PERSISTENT = 1; // 0x1

    field @Deprecated public static final int RECENT_FAILURE_AP_UNABLE_TO_HANDLE_NEW_STA = 17; // 0x11

    field @Deprecated public static final int RECENT_FAILURE_AP_UNABLE_TO_HANDLE_NEW_STA = 17; // 0x11

wifi/api/system-current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -326,6 +326,8 @@ package android.net.wifi { 
    field @Deprecated public static final int METERED_OVERRIDE_METERED = 1; // 0x1

    field @Deprecated public static final int METERED_OVERRIDE_METERED = 1; // 0x1

    field @Deprecated public static final int METERED_OVERRIDE_NONE = 0; // 0x0

    field @Deprecated public static final int METERED_OVERRIDE_NONE = 0; // 0x0

    field @Deprecated public static final int METERED_OVERRIDE_NOT_METERED = 2; // 0x2

    field @Deprecated public static final int METERED_OVERRIDE_NOT_METERED = 2; // 0x2

    field @Deprecated public static final int RANDOMIZATION_AUTO = 3; // 0x3

    field @Deprecated public static final int RANDOMIZATION_ENHANCED = 2; // 0x2

    field @Deprecated public static final int RANDOMIZATION_NONE = 0; // 0x0

    field @Deprecated public static final int RANDOMIZATION_NONE = 0; // 0x0

    field @Deprecated public static final int RANDOMIZATION_PERSISTENT = 1; // 0x1

    field @Deprecated public static final int RANDOMIZATION_PERSISTENT = 1; // 0x1

    field @Deprecated public static final int RECENT_FAILURE_AP_UNABLE_TO_HANDLE_NEW_STA = 17; // 0x11

    field @Deprecated public static final int RECENT_FAILURE_AP_UNABLE_TO_HANDLE_NEW_STA = 17; // 0x11

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

+22 −4
Original line number Original line Diff line number Diff line
@@ -1130,7 +1130,9 @@ public class WifiConfiguration implements Parcelable { 
    @Retention(RetentionPolicy.SOURCE)

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(prefix = {"RANDOMIZATION_"}, value = {

    @IntDef(prefix = {"RANDOMIZATION_"}, value = {

            RANDOMIZATION_NONE,

            RANDOMIZATION_NONE,

            RANDOMIZATION_PERSISTENT})

            RANDOMIZATION_PERSISTENT,

            RANDOMIZATION_ENHANCED,

            RANDOMIZATION_AUTO})

    public @interface MacRandomizationSetting {}

    public @interface MacRandomizationSetting {}





    /**

    /**
@@ -1146,15 +1148,31 @@ public class WifiConfiguration implements Parcelable { 
    @SystemApi

    @SystemApi

    public static final int RANDOMIZATION_PERSISTENT = 1;

    public static final int RANDOMIZATION_PERSISTENT = 1;





    /**

     * Use a randomly generated MAC address for connections to this network.

     * This option does not persist the randomized MAC address.

     * @hide

     */

    @SystemApi

    public static final int RANDOMIZATION_ENHANCED = 2;



    /**

     * Let the wifi framework automatically decide the MAC randomization strategy.

     * @hide

     */

    @SystemApi

    public static final int RANDOMIZATION_AUTO = 3;



    /**

    /**

     * Level of MAC randomization for this network.

     * Level of MAC randomization for this network.

     * One of {@link #RANDOMIZATION_NONE} or {@link #RANDOMIZATION_PERSISTENT}.

     * One of {@link #RANDOMIZATION_NONE}, {@link #RANDOMIZATION_AUTO},

     * By default this field is set to {@link #RANDOMIZATION_PERSISTENT}.

     * {@link #RANDOMIZATION_PERSISTENT} or {@link #RANDOMIZATION_ENHANCED}.

     * By default this field is set to {@link #RANDOMIZATION_AUTO}.

     * @hide

     * @hide

     */

     */

    @SystemApi

    @SystemApi

    @MacRandomizationSetting

    @MacRandomizationSetting

    public int macRandomizationSetting = RANDOMIZATION_PERSISTENT;

    public int macRandomizationSetting = RANDOMIZATION_AUTO;





    /**

    /**

     * @hide

     * @hide