Revert "Revert "Rename IUsdInterface to IStaInterface, and add a..."

Revert submission 32132699-revert-32029057-mainline-supplicant-generalize-iface-type-NJLGVJHNTR

Reason for revert: Located the root cause of the build failure

Reverted changes: /q/submissionid:32132699-revert-32029057-mainline-supplicant-generalize-iface-type-NJLGVJHNTR

Change-Id: I2cfddf02e250cc645108aa33872415b84da00fd6

3 files changed, 32 insertions, 18 deletions

diff --git a/aidl/mainline_supplicant/android/system/wifi/mainline_supplicant/IMainlineSupplicant.aidl b/aidl/mainline_supplicant/android/system/wifi/mainline_supplicant/IMainlineSupplicant.aidl
index 350b3f62b7..40ed698b7d 100644
--- a/aidl/mainline_supplicant/android/system/wifi/mainline_supplicant/IMainlineSupplicant.aidl
+++ b/aidl/mainline_supplicant/android/system/wifi/mainline_supplicant/IMainlineSupplicant.aidl
@@ -16,7 +16,7 @@
 
 package android.system.wifi.mainline_supplicant;
 
-import android.system.wifi.mainline_supplicant.IUsdInterface;
+import android.system.wifi.mainline_supplicant.IStaInterface;
 
 /**
  * Root of the mainline supplicant interface. This is an unstable AIDL interface used
@@ -24,17 +24,17 @@ import android.system.wifi.mainline_supplicant.IUsdInterface;
  */
 interface IMainlineSupplicant {
     /**
-     * Register an interface for use by USD.
+     * Register a STA interface with the supplicant.
      *
      * @param ifaceName Name of the interface (ex. wlan0)
      * @throws ServiceSpecificException with one of the following values:
      *         |SupplicantStatusCode.FAILURE_UNKNOWN|
      *         |SupplicantStatusCode.FAILURE_ARGS_INVALID|
      */
-    @PropagateAllowBlocking IUsdInterface addUsdInterface(String ifaceName);
+    @PropagateAllowBlocking IStaInterface addStaInterface(String ifaceName);
 
     /**
-     * Remove an interface that is being used for USD.
+     * Remove a STA interface from the supplicant.
      *
      * @param ifaceName Name of the interface (ex. wlan0)
      * @throws ServiceSpecificException with one of the following values:
@@ -42,7 +42,7 @@ interface IMainlineSupplicant {
      *         |SupplicantStatusCode.FAILURE_ARGS_INVALID|
      *         |SupplicantStatusCode.FAILURE_IFACE_UNKNOWN|
      */
-    void removeUsdInterface(String ifaceName);
+    void removeStaInterface(String ifaceName);
 
     /**
      * Terminate the service.
diff --git a/aidl/mainline_supplicant/android/system/wifi/mainline_supplicant/IUsdInterface.aidl b/aidl/mainline_supplicant/android/system/wifi/mainline_supplicant/IStaInterface.aidl
index 50a0141117..f9ba71f971 100644
--- a/aidl/mainline_supplicant/android/system/wifi/mainline_supplicant/IUsdInterface.aidl
+++ b/aidl/mainline_supplicant/android/system/wifi/mainline_supplicant/IStaInterface.aidl
@@ -16,13 +16,15 @@
 
 package android.system.wifi.mainline_supplicant;
 
+import android.system.wifi.mainline_supplicant.IStaInterfaceCallback;
 import android.system.wifi.mainline_supplicant.UsdMessageInfo;
 import android.system.wifi.mainline_supplicant.UsdServiceProtoType;
 
 /**
- * Interface for performing Unsynchronized Service Discovery (USD) operations.
+ * Interface exposed by the supplicant for each station mode network
+ * interface (ex. wlan0) it controls.
  */
-interface IUsdInterface {
+interface IStaInterface {
     /**
      * Capabilities supported by USD. Values are only valid if |isUsdPublisherSupported|
      * and/or |isUsdSubscriberSupported| are true.
@@ -241,6 +243,13 @@ interface IUsdInterface {
     }
 
     /**
+     * Register for callbacks on this interface.
+     *
+     * @param callback Callback object to invoke.
+     */
+    void registerCallback(in IStaInterfaceCallback callback);
+
+    /**
      * Retrieve capabilities related to Unsynchronized Service Discovery (USD).
      *
      * @return Instance of |UsdCapabilities| containing the capability info.
diff --git a/aidl/mainline_supplicant/android/system/wifi/mainline_supplicant/IUsdCallback.aidl b/aidl/mainline_supplicant/android/system/wifi/mainline_supplicant/IStaInterfaceCallback.aidl
index c5752a3765..4a386beb2d 100644
--- a/aidl/mainline_supplicant/android/system/wifi/mainline_supplicant/IUsdCallback.aidl
+++ b/aidl/mainline_supplicant/android/system/wifi/mainline_supplicant/IStaInterfaceCallback.aidl
@@ -20,9 +20,14 @@ import android.system.wifi.mainline_supplicant.UsdMessageInfo;
 import android.system.wifi.mainline_supplicant.UsdServiceProtoType;
 
 /**
- * Callbacks for Unsynchronized Service Discovery (USD) operations.
+ * Callback interface exposed by the mainline supplicant service
+ * for each station mode interface (IStaInterface).
+ *
+ * Clients need to host an instance of this AIDL interface object and
+ * pass a reference of the object to the mainline supplicant via the
+ * corresponding |IStaInterface.registerCallback| method.
  */
-interface IUsdCallback {
+interface IStaInterfaceCallback {
     /**
      * Information about a USD discovery session with a specific peer.
      */
@@ -100,7 +105,7 @@ interface IUsdCallback {
      * @param cmdId Identifier for the original request.
      * @param publishId Identifier for the publish session.
      */
-    void onPublishStarted(in int cmdId, in int publishId);
+    void onUsdPublishStarted(in int cmdId, in int publishId);
 
     /**
      * Called in response to |IUsdInterface.startSubscribe| to indicate that the
@@ -109,7 +114,7 @@ interface IUsdCallback {
      * @param cmdId Identifier for the original request.
      * @param subscribeId Identifier for the subscribe session.
      */
-    void onSubscribeStarted(in int cmdId, in int subscribeId);
+    void onUsdSubscribeStarted(in int cmdId, in int subscribeId);
 
     /**
      * Called in response to |IUsdInterface.startPublish| to indicate that the
@@ -117,7 +122,7 @@ interface IUsdCallback {
      *
      * @param cmdId Identifier for the original request.
      */
-    void onPublishConfigFailed(in int cmdId);
+    void onUsdPublishConfigFailed(in int cmdId);
 
     /**
      * Called in response to |IUsdInterface.startSubscribe| to indicate that the
@@ -125,7 +130,7 @@ interface IUsdCallback {
      *
      * @param cmdId Identifier for the original request.
      */
-    void onSubscribeConfigFailed(in int cmdId);
+    void onUsdSubscribeConfigFailed(in int cmdId);
 
     /**
      * Called in response to |IUsdInterface.cancelPublish| to indicate that the session
@@ -135,7 +140,7 @@ interface IUsdCallback {
      * @param publishId Identifier for the publish session.
      * @param reasonCode Code indicating the reason for the session cancellation.
      */
-    void onPublishTerminated(in int publishId, in UsdReasonCode reasonCode);
+    void onUsdPublishTerminated(in int publishId, in UsdReasonCode reasonCode);
 
     /**
      * Called in response to |IUsdInterface.cancelSubscribe| to indicate that the session
@@ -145,14 +150,14 @@ interface IUsdCallback {
      * @param subscribeId Identifier for the subscribe session.
      * @param reasonCode Code indicating the reason for the session cancellation.
      */
-    void onSubscribeTerminated(in int subscribeId, in UsdReasonCode reasonCode);
+    void onUsdSubscribeTerminated(in int subscribeId, in UsdReasonCode reasonCode);
 
     /**
      * Indicates that the publisher sent solicited publish message to the subscriber.
      *
      * @param info Instance of |UsdServiceDiscoveryInfo| containing information about the reply.
      */
-    void onPublishReplied(in UsdServiceDiscoveryInfo info);
+    void onUsdPublishReplied(in UsdServiceDiscoveryInfo info);
 
     /**
      * Indicates that a publisher was discovered. Only called if this device is acting as a
@@ -160,12 +165,12 @@ interface IUsdCallback {
      *
      * @param info Instance of |UsdServiceDiscoveryInfo| containing information about the service.
      */
-    void onServiceDiscovered(in UsdServiceDiscoveryInfo info);
+    void onUsdServiceDiscovered(in UsdServiceDiscoveryInfo info);
 
     /**
      * Indicates that a message was received on an active USD link.
      *
      * @param messageInfo Information about the message that was received.
      */
-    void onMessageReceived(in UsdMessageInfo messageInfo);
+    void onUsdMessageReceived(in UsdMessageInfo messageInfo);
 }