diff options
6 files changed, 16 insertions, 16 deletions
diff --git a/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicant.aidl b/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicant.aidl index b4371fd97f..4b26ac3013 100644 --- a/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicant.aidl +++ b/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicant.aidl @@ -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(); diff --git a/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantP2pIface.aidl b/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantP2pIface.aidl index d7eff76144..e204184a98 100644 --- a/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantP2pIface.aidl +++ b/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantP2pIface.aidl @@ -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); diff --git a/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaIface.aidl b/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaIface.aidl index 9293bfdbff..826b0f1eb1 100644 --- a/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaIface.aidl +++ b/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaIface.aidl @@ -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(); @@ -50,7 +50,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); diff --git a/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicant.aidl b/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicant.aidl index 2ac1db7771..c17289d932 100644 --- a/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicant.aidl +++ b/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicant.aidl @@ -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. diff --git a/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantP2pIface.aidl b/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantP2pIface.aidl index 9021bf5635..313ee8b1ac 100644 --- a/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantP2pIface.aidl +++ b/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantP2pIface.aidl @@ -104,7 +104,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. @@ -321,7 +321,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. diff --git a/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaIface.aidl b/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaIface.aidl index 8ab0c826f7..c98a9a1cbc 100644 --- a/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaIface.aidl +++ b/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaIface.aidl @@ -88,7 +88,7 @@ interface ISupplicantStaIface { * |SupplicantStatusCode.FAILURE_UNKNOWN|, * |SupplicantStatusCode.FAILURE_IFACE_INVALID| */ - ISupplicantStaNetwork addNetwork(); + @PropagateAllowBlocking ISupplicantStaNetwork addNetwork(); /** * Send driver command to add the specified RX filter. @@ -260,7 +260,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. |