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

Commit 15ec293e authored by Sunil Ravi's avatar Sunil Ravi
Browse files

Wifi: DPP STA Enrollee-Responder mode 

Added system APIs for DPP STA Enrollee-Responder mode
 - start DPP in Enrollee-Responder mode
 - Callback function to pass Generated DPP bootstrap URI
Defined a new failure code to indicate generate DPP
URI failure.

Bug: 162686712
Test: atest 8BFAZ01446 com.android.server.wifi
Test: act.py -c <dpp config file> -tc WifiDppTest
Change-Id: I094d06dd1f195aa9d647deb65cca91a81cfc10db
parent 28b33b31

wifi/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ package android.net.wifi { 
    field public static final int EASY_CONNECT_EVENT_FAILURE_NOT_COMPATIBLE = -3; // 0xfffffffd

    field public static final int EASY_CONNECT_EVENT_FAILURE_NOT_SUPPORTED = -8; // 0xfffffff8

    field public static final int EASY_CONNECT_EVENT_FAILURE_TIMEOUT = -6; // 0xfffffffa

    field public static final int EASY_CONNECT_EVENT_FAILURE_URI_GENERATION = -13; // 0xfffffff3

  }



  public final class ScanResult implements android.os.Parcelable {

wifi/api/system-current.txt

+10 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ package android.net.wifi { 


  public abstract class EasyConnectStatusCallback {

    ctor public EasyConnectStatusCallback();

    method public void onBootstrapUriGenerated(@NonNull String);

    method public abstract void onConfiguratorSuccess(int);

    method public abstract void onEnrolleeSuccess(int);

    method public void onFailure(int);
@@ -497,6 +498,7 @@ package android.net.wifi { 
    method @RequiresPermission(android.Manifest.permission.WIFI_UPDATE_USABILITY_STATS_SCORE) public boolean setWifiConnectedNetworkScorer(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.WifiConnectedNetworkScorer);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void startEasyConnectAsConfiguratorInitiator(@NonNull String, int, int, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.EasyConnectStatusCallback);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void startEasyConnectAsEnrolleeInitiator(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.EasyConnectStatusCallback);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void startEasyConnectAsEnrolleeResponder(@Nullable String, int, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.EasyConnectStatusCallback);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void startLocalOnlyHotspot(@NonNull android.net.wifi.SoftApConfiguration, @Nullable java.util.concurrent.Executor, @Nullable android.net.wifi.WifiManager.LocalOnlyHotspotCallback);

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public boolean startScan(android.os.WorkSource);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void startSubscriptionProvisioning(@NonNull android.net.wifi.hotspot2.OsuProvider, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.hotspot2.ProvisioningCallback);
@@ -523,6 +525,14 @@ package android.net.wifi { 
    field public static final int DEVICE_MOBILITY_STATE_LOW_MVMT = 2; // 0x2

    field public static final int DEVICE_MOBILITY_STATE_STATIONARY = 3; // 0x3

    field public static final int DEVICE_MOBILITY_STATE_UNKNOWN = 0; // 0x0

    field public static final int EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP256R1 = 3; // 0x3

    field public static final int EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP384R1 = 4; // 0x4

    field public static final int EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP512R1 = 5; // 0x5

    field public static final int EASY_CONNECT_CRYPTOGRAPHY_CURVE_DEFAULT = 0; // 0x0

    field public static final int EASY_CONNECT_CRYPTOGRAPHY_CURVE_PRIME256V1 = 0; // 0x0

    field public static final int EASY_CONNECT_CRYPTOGRAPHY_CURVE_SECP384R1 = 1; // 0x1

    field public static final int EASY_CONNECT_CRYPTOGRAPHY_CURVE_SECP521R1 = 2; // 0x2

    field public static final int EASY_CONNECT_DEVICE_INFO_MAXIMUM_LENGTH = 40; // 0x28

    field public static final int EASY_CONNECT_NETWORK_ROLE_AP = 1; // 0x1

    field public static final int EASY_CONNECT_NETWORK_ROLE_STA = 0; // 0x0

    field public static final String EXTRA_CHANGE_REASON = "changeReason";

wifi/java/android/net/wifi/EasyConnectStatusCallback.java

+19 −0
Original line number Diff line number Diff line
@@ -161,6 +161,11 @@ public abstract class EasyConnectStatusCallback { 
     */

    public static final int EASY_CONNECT_EVENT_FAILURE_ENROLLEE_REJECTED_CONFIGURATION = -12;



    /**

     * Easy Connect Failure event: System failed to generate DPP URI.

     */

    public static final int EASY_CONNECT_EVENT_FAILURE_URI_GENERATION = -13;



    /** @hide */

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

            EASY_CONNECT_EVENT_FAILURE_INVALID_URI,
@@ -175,6 +180,7 @@ public abstract class EasyConnectStatusCallback { 
            EASY_CONNECT_EVENT_FAILURE_CANNOT_FIND_NETWORK,

            EASY_CONNECT_EVENT_FAILURE_ENROLLEE_AUTHENTICATION,

            EASY_CONNECT_EVENT_FAILURE_ENROLLEE_REJECTED_CONFIGURATION,

            EASY_CONNECT_EVENT_FAILURE_URI_GENERATION,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface EasyConnectFailureStatusCode {
@@ -264,4 +270,17 @@ public abstract class EasyConnectStatusCallback { 
     */

    @SystemApi

    public abstract void onProgress(@EasyConnectProgressStatusCode int code);



    /**

     * Called when local Easy Connect Responder successfully generates a DPP URI from

     * the supplicant. This callback is the first successful outcome

     * of a Easy Connect Responder flow starting with

     * {@link WifiManager#startEasyConnectAsEnrolleeResponder(String, int, Executor,

     * EasyConnectStatusCallback)} .

     *

     * @param uri DPP URI from the supplicant.

     * @hide

     */

    @SystemApi

    public void onBootstrapUriGenerated(@NonNull String uri) {};

}

wifi/java/android/net/wifi/IDppCallback.aidl

+6 −0
Original line number Diff line number Diff line
@@ -45,4 +45,10 @@ oneway interface IDppCallback 
     * to show progress.

     */

    void onProgress(int status);



    /**

     * Called when local DPP Responder successfully generates a URI.

     */

    void onBootstrapUriGenerated(String uri);



}

wifi/java/android/net/wifi/IWifiManager.aidl

+3 −0
Original line number Diff line number Diff line
@@ -235,6 +235,9 @@ interface IWifiManager 
    void startDppAsEnrolleeInitiator(in IBinder binder, in String configuratorUri,

        in IDppCallback callback);



    void startDppAsEnrolleeResponder(in IBinder binder, in String deviceInfo, int curve,

        in IDppCallback callback);



    void stopDppSession();



    void updateWifiUsabilityScore(int seqNum, int score, int predictionHorizonSec);