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

Revert submission 32029057-mainline-supplicant-generalize-iface-type

Reason for revert: DroidMonitor: Potential culprit for http://b/400984769 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

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

Change-Id: I376920204d8a811d87a7eca3e66284e7990d8725

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