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

Commit 22373cb4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "supplicant(interface): Remove "wpa_supplicant""

parents 37c96a54 8c6a8772
Loading
Loading
Loading
Loading
+10 −10
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ import ISupplicantCallback;
import ISupplicantIface;

/**
 * Interface exposed by the wpa_supplicant HIDL service registered
 * Interface exposed by the supplicant HIDL service registered
 * with the hardware service manager.
 * This is the root level object for any wpa_supplicant interactions.
 * This is the root level object for any the supplicant interactions.
 */
interface ISupplicant {
  /**
   * Debug levels for wpa_supplicant.
   * Debug levels for the supplicant.
   * Only log messages with a level greater than the set level
   * (via |setDebugParams|) will be logged.
   */
@@ -41,7 +41,7 @@ interface ISupplicant {

  /**
   * Structure describing the type and name of an iface
   * controlled by wpa_supplicant.
   * controlled by the supplicant.
   */
  struct IfaceInfo {
      /**
@@ -56,7 +56,7 @@ interface ISupplicant {

  /**
   * Gets a HIDL interface object for the interface corresponding to iface
   * name which wpa_supplicant already controls.
   * name which the supplicant already controls.
   *
   * @param ifaceInfo Combination of the iface type and name retrieved
   *        using |listInterfaces|.
@@ -72,7 +72,7 @@ interface ISupplicant {
      generates (SupplicantStatus status, ISupplicantIface iface);

  /**
   * Retrieve a list of all the interfaces controlled by wpa_supplicant.
   * Retrieve a list of all the interfaces controlled by the supplicant.
   *
   * The corresponding |ISupplicantIface| object for any interface can be
   * retrieved using |getInterface| method.
@@ -81,12 +81,12 @@ interface ISupplicant {
   *         Possible status codes:
   *         |SupplicantStatusCode.SUCCESS|,
   *         |SupplicantStatusCode.FAILURE_UNKNOWN|
   * @return ifaces List of all interfaces controlled by wpa_supplicant.
   * @return ifaces List of all interfaces controlled by the supplicant.
   */
  listInterfaces() generates (SupplicantStatus status, vec<IfaceInfo> ifaces);

  /**
   * Register for callbacks from the wpa_supplicant service.
   * Register for callbacks from the supplicant service.
   *
   * These callbacks are invoked for global events that are not specific
   * to any interface or network. Registration of multiple callback
@@ -104,9 +104,9 @@ interface ISupplicant {
      generates (SupplicantStatus status);

  /**
   * Set debug parameters for wpa_supplicant.
   * Set debug parameters for the supplicant.
   *
   * @param level Debug logging level for wpa_supplicant.
   * @param level Debug logging level for the supplicant.
   *        (one of |DebugLevel| values).
   * @param timestamp Determines whether to show timestamps in logs or
   *        not.
+2 −2
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@
package android.hardware.wifi.supplicant@1.0;

/**
 * Callback Interface exposed by the wpa_supplicant service (ISupplicant).
 * Callback Interface exposed by the supplicant service (ISupplicant).
 *
 * Clients need to host an instance of this HIDL interface object and
 * pass a reference of the object to wpa_supplicant via the
 * pass a reference of the object to the supplicant via the
 * |ISupplicant.registerCallback| method.
 */
interface ISupplicantCallback {
+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package android.hardware.wifi.supplicant@1.0;
import ISupplicantNetwork;

/**
 * Interface exposed by wpa_supplicant for each network interface (e.g wlan0)
 * Interface exposed by the supplicant for each network interface (e.g wlan0)
 * it controls.
 */
interface ISupplicantIface {
@@ -97,7 +97,7 @@ interface ISupplicantIface {
      generates (SupplicantStatus status, ISupplicantNetwork network);

  /**
   * Retrieve a list of all the network Id's controlled by wpa_supplicant.
   * Retrieve a list of all the network Id's controlled by the supplicant.
   *
   * The corresponding |ISupplicantNetwork| object for any network can be
   * retrieved using |getNetwork| method.
@@ -106,7 +106,7 @@ interface ISupplicantIface {
   *         Possible status codes:
   *         |SupplicantStatusCode.SUCCESS|,
   *         |SupplicantStatusCode.FAILURE_UNKNOWN|
   * @return networkIds List of all network Id's controlled by wpa_supplicant.
   * @return networkIds List of all network Id's controlled by the supplicant.
   */
  listNetworks()
      generates (SupplicantStatus status, vec<SupplicantNetworkId> networkIds);
+4 −4
Original line number Diff line number Diff line
@@ -17,19 +17,19 @@
package android.hardware.wifi.supplicant@1.0;

/**
 * Interface exposed by wpa_supplicant for each network configuration it
 * Interface exposed by the supplicant for each network configuration it
 * controls.
 * A network is wpa_supplicant's way of representing the configuration
 * A network is the supplicant's way of representing the configuration
 * parameters of a Wifi service set. Service sets are identified by their
 * service set identitifier (SSID). The parameters for a network includes the
 * credentials, bssid, etc.
 */
interface ISupplicantNetwork {
  /**
   * Retrieves the ID allocated to this network by wpa_supplicant.
   * Retrieves the ID allocated to this network by the supplicant.
   *
   * This is not the |SSID| of the network, but an internal identifier for
   * this network used by wpa_supplicant.
   * this network used by the supplicant.
   *
   * @return status Status of the operation.
   *         Possible status codes:
+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import ISupplicantIface;
import ISupplicantP2pIfaceCallback;

/**
 * Interface exposed by wpa_supplicant for each P2P mode network
 * Interface exposed by the supplicant for each P2P mode network
 * interface (e.g p2p0) it controls.
 */
interface ISupplicantP2pIface extends ISupplicantIface {
Loading