Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Change-Id: If47724de35d8399d0e391a29a4aa92aa4e1dbbd7
This commit is contained in:
Treehugger Robot
2022-02-22 17:28:45 +00:00
committed by Automerger Merge Worker
parent d3f8b39e76 4965e27b86
commit 1331953ef3
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicant.aidl
View File

@@ -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();

4
wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantP2pIface.aidl
View File

@@ -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);

4
wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaIface.aidl
View File

@@ -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);

8
wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicant.aidl
View File

@@ -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.

4
wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantP2pIface.aidl
View File

@@ -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.

4
wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaIface.aidl
View File

@@ -86,7 +86,7 @@ interface ISupplicantStaIface {
* |SupplicantStatusCode.FAILURE_UNKNOWN|,
* |SupplicantStatusCode.FAILURE_IFACE_INVALID|
*/
ISupplicantStaNetwork addNetwork();
@PropagateAllowBlocking ISupplicantStaNetwork addNetwork();
/**
* Send driver command to add the specified RX filter.
@@ -231,7 +231,7 @@ interface ISupplicantStaIface {
* |SupplicantStatusCode.FAILURE_IFACE_INVALID|,
* |SupplicantStatusCode.FAILURE_NETWORK_UNKNOWN|
*/
ISupplicantStaNetwork getNetwork(in int id);
@PropagateAllowBlocking ISupplicantStaNetwork getNetwork(in int id);
/**
* Retrieves the type of the network interface.