Merge "Add failure codes to onUsdPublishConfigFailed and onUsdSubscribeConfigFailed." into main (1928a2e6) · Commits · e / os / android_hardware_interfaces

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

+8 −2

Original line number	Diff line number	Diff line
		@@ -84,8 +84,8 @@ interface ISupplicantStaIfaceCallback {
		oneway void onPmkSaCacheAdded(in android.hardware.wifi.supplicant.PmkSaCacheData pmkSaData);
		oneway void onUsdPublishStarted(in int cmdId, in int publishId);
		oneway void onUsdSubscribeStarted(in int cmdId, in int subscribeId);
		oneway void onUsdPublishConfigFailed(in int cmdId);
		oneway void onUsdSubscribeConfigFailed(in int cmdId);
		oneway void onUsdPublishConfigFailed(in int cmdId, in android.hardware.wifi.supplicant.ISupplicantStaIfaceCallback.UsdConfigErrorCode errorCode);
		oneway void onUsdSubscribeConfigFailed(in int cmdId, in android.hardware.wifi.supplicant.ISupplicantStaIfaceCallback.UsdConfigErrorCode errorCode);
		oneway void onUsdPublishTerminated(in int publishId, in android.hardware.wifi.supplicant.UsdTerminateReasonCode reasonCode);
		oneway void onUsdSubscribeTerminated(in int subscribeId, in android.hardware.wifi.supplicant.UsdTerminateReasonCode reasonCode);
		oneway void onUsdPublishReplied(in android.hardware.wifi.supplicant.UsdServiceDiscoveryInfo info);
		@@ -97,4 +97,10 @@ interface ISupplicantStaIfaceCallback {
		MULTI_LINK_RECONFIG_AP_REMOVAL = 1,
		MULTI_LINK_DYNAMIC_RECONFIG = 2,
		}
		@Backing(type="int") @VintfStability
		enum UsdConfigErrorCode {
		FAILURE_UNKNOWN = 0,
		FAILURE_TIMEOUT = 1,
		FAILURE_NOT_AVAILABLE = 2,
		}
		}

+22 −2

Original line number	Diff line number	Diff line
		@@ -438,13 +438,33 @@ oneway interface ISupplicantStaIfaceCallback {
		*/
		void onUsdSubscribeStarted(in int cmdId, in int subscribeId);

		/**
		* Error codes returned by \|onUsdPublishConfigFailed\| and \|onUsdSubscribeConfigFailed\|.
		*/
		@VintfStability
		@Backing(type="int")
		enum UsdConfigErrorCode {
		/**
		* Unknown failure.
		*/
		FAILURE_UNKNOWN = 0,
		/**
		* The requested operation timed out.
		*/
		FAILURE_TIMEOUT = 1,
		/**
		* The requested operation is currently not available.
		*/
		FAILURE_NOT_AVAILABLE = 2,
		}

		/**
		* Called in response to \|ISupplicantStaIface.startUsdPublish\| to indicate that the
		* publish session could not be configured.
		*
		* @param cmdId Identifier for the original request.
		*/
		void onUsdPublishConfigFailed(in int cmdId);
		void onUsdPublishConfigFailed(in int cmdId, in UsdConfigErrorCode errorCode);

		/**
		* Called in response to \|ISupplicantStaIface.startUsdSubscribe\| to indicate that the
		@@ -452,7 +472,7 @@ oneway interface ISupplicantStaIfaceCallback {
		*
		* @param cmdId Identifier for the original request.
		*/
		void onUsdSubscribeConfigFailed(in int cmdId);
		void onUsdSubscribeConfigFailed(in int cmdId, in UsdConfigErrorCode errorCode);

		/**
		* Called in response to \|ISupplicantStaIface.cancelUsdPublish\| to indicate that the session

+4 −2

Original line number	Diff line number	Diff line
		@@ -254,10 +254,12 @@ class SupplicantStaIfaceCallback : public BnSupplicantStaIfaceCallback {
		int32_t /* subscribeId */) override {
		return ndk::ScopedAStatus::ok();
		}
		::ndk::ScopedAStatus onUsdPublishConfigFailed(int32_t /* cmdId */) override {
		::ndk::ScopedAStatus onUsdPublishConfigFailed(int32_t /* cmdId */,
		UsdConfigErrorCode /* errorCode */) override {
		return ndk::ScopedAStatus::ok();
		}
		::ndk::ScopedAStatus onUsdSubscribeConfigFailed(int32_t /* cmdId */) override {
		::ndk::ScopedAStatus onUsdSubscribeConfigFailed(int32_t /* cmdId */,
		UsdConfigErrorCode /* errorCode */) override {
		return ndk::ScopedAStatus::ok();
		}
		::ndk::ScopedAStatus onUsdPublishTerminated(int32_t /* publishId */,