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

Commit 24d6da2d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add @PropagateAllowBlocking tag to supplicant methods that return an... 

Merge "Add @PropagateAllowBlocking tag to supplicant methods that return an interface." am: 4965e27b am: 1331953e

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1964740

Change-Id: I0bcd03263c9d9825f7ab2041498e6fef51349758
parents e6d27b44 1331953e

wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicant.aidl

+4 −4
Original line number Diff line number Diff line
@@ -34,11 +34,11 @@ 
package android.hardware.wifi.supplicant;

@VintfStability

interface ISupplicant {

  android.hardware.wifi.supplicant.ISupplicantP2pIface addP2pInterface(in String ifName);

  android.hardware.wifi.supplicant.ISupplicantStaIface addStaInterface(in String ifName);

  @PropagateAllowBlocking android.hardware.wifi.supplicant.ISupplicantP2pIface addP2pInterface(in String ifName);

  @PropagateAllowBlocking android.hardware.wifi.supplicant.ISupplicantStaIface addStaInterface(in String ifName);

  android.hardware.wifi.supplicant.DebugLevel getDebugLevel();

  android.hardware.wifi.supplicant.ISupplicantP2pIface getP2pInterface(in String ifName);

  android.hardware.wifi.supplicant.ISupplicantStaIface getStaInterface(in String ifName);

  @PropagateAllowBlocking android.hardware.wifi.supplicant.ISupplicantP2pIface getP2pInterface(in String ifName);

  @PropagateAllowBlocking android.hardware.wifi.supplicant.ISupplicantStaIface getStaInterface(in String ifName);

  boolean isDebugShowKeysEnabled();

  boolean isDebugShowTimestampEnabled();

  android.hardware.wifi.supplicant.IfaceInfo[] listInterfaces();

wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantP2pIface.aidl

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ interface ISupplicantP2pIface { 
  void addBonjourService(in byte[] query, in byte[] response);

  void addGroup(in boolean persistent, in int persistentNetworkId);

  void addGroupWithConfig(in byte[] ssid, in String pskPassphrase, in boolean persistent, in int freq, in byte[] peerAddress, in boolean joinExistingGroup);

  android.hardware.wifi.supplicant.ISupplicantP2pNetwork addNetwork();

  @PropagateAllowBlocking android.hardware.wifi.supplicant.ISupplicantP2pNetwork addNetwork();

  void addUpnpService(in int version, in String serviceName);

  void cancelConnect();

  void cancelServiceDiscovery(in long identifier);
@@ -54,7 +54,7 @@ interface ISupplicantP2pIface { 
  boolean getEdmg();

  android.hardware.wifi.supplicant.P2pGroupCapabilityMask getGroupCapability(in byte[] peerAddress);

  String getName();

  android.hardware.wifi.supplicant.ISupplicantP2pNetwork getNetwork(in int id);

  @PropagateAllowBlocking android.hardware.wifi.supplicant.ISupplicantP2pNetwork getNetwork(in int id);

  byte[] getSsid(in byte[] peerAddress);

  android.hardware.wifi.supplicant.IfaceType getType();

  void invite(in String groupIfName, in byte[] goDeviceAddress, in byte[] peerAddress);

wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaIface.aidl

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ package android.hardware.wifi.supplicant; 
interface ISupplicantStaIface {

  int addDppPeerUri(in String uri);

  int addExtRadioWork(in String name, in int freqInMhz, in int timeoutInSec);

  android.hardware.wifi.supplicant.ISupplicantStaNetwork addNetwork();

  @PropagateAllowBlocking android.hardware.wifi.supplicant.ISupplicantStaNetwork addNetwork();

  void addRxFilter(in android.hardware.wifi.supplicant.RxFilterType type);

  void cancelWps();

  void disconnect();
@@ -48,7 +48,7 @@ interface ISupplicantStaIface { 
  android.hardware.wifi.supplicant.KeyMgmtMask getKeyMgmtCapabilities();

  byte[] getMacAddress();

  String getName();

  android.hardware.wifi.supplicant.ISupplicantStaNetwork getNetwork(in int id);

  @PropagateAllowBlocking android.hardware.wifi.supplicant.ISupplicantStaNetwork getNetwork(in int id);

  android.hardware.wifi.supplicant.IfaceType getType();

  android.hardware.wifi.supplicant.WpaDriverCapabilitiesMask getWpaDriverCapabilities();

  void initiateAnqpQuery(in byte[] macAddress, in android.hardware.wifi.supplicant.AnqpInfoId[] infoElements, in android.hardware.wifi.supplicant.Hs20AnqpSubtypes[] subTypes);

wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicant.aidl

+4 −4
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ interface ISupplicant { 
     *         |SupplicantStatusCode.FAILURE_UNKNOWN|,

     *         |SupplicantStatusCode.FAILURE_IFACE_EXISTS|

     */

    ISupplicantP2pIface addP2pInterface(in String ifName);

    ISupplicantStaIface addStaInterface(in String ifName);

    @PropagateAllowBlocking ISupplicantP2pIface addP2pInterface(in String ifName);

    @PropagateAllowBlocking ISupplicantStaIface addStaInterface(in String ifName);



    /**

     * Get the debug level set.
@@ -68,8 +68,8 @@ interface ISupplicant { 
     *         |SupplicantStatusCode.FAILURE_UNKNOWN|,

     *         |SupplicantStatusCode.FAILURE_IFACE_UNKNOWN|

     */

    ISupplicantP2pIface getP2pInterface(in String ifName);

    ISupplicantStaIface getStaInterface(in String ifName);

    @PropagateAllowBlocking ISupplicantP2pIface getP2pInterface(in String ifName);

    @PropagateAllowBlocking ISupplicantStaIface getStaInterface(in String ifName);



    /**

     * Get whether the keys are shown in the debug logs or not.

wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantP2pIface.aidl

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ interface ISupplicantP2pIface { 
     *         |SupplicantStatusCode.FAILURE_UNKNOWN|,

     *         |SupplicantStatusCode.FAILURE_IFACE_INVALID|

     */

    ISupplicantP2pNetwork addNetwork();

    @PropagateAllowBlocking ISupplicantP2pNetwork addNetwork();



    /**

     * This command can be used to add a UPNP service.
@@ -320,7 +320,7 @@ interface ISupplicantP2pIface { 
     *         |SupplicantStatusCode.FAILURE_IFACE_INVALID|,

     *         |SupplicantStatusCode.FAILURE_NETWORK_UNKNOWN|

     */

    ISupplicantP2pNetwork getNetwork(in int id);

    @PropagateAllowBlocking ISupplicantP2pNetwork getNetwork(in int id);



    /**

     * Gets the operational SSID of the device.