Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11921783 authored Jan 09, 2023 by Biswarup Pal

Add suspendable option in NanDiscoveryCommonConfig

Test: m
Bug: 263014869
Change-Id: I0bef43f361a3773ff3e589d44afe4595ddd4e21f

parent 65ea0b93

wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanDiscoveryCommonConfig.aidl

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -54,4 +54,5 @@ parcelable NanDiscoveryCommonConfig {
	android.hardware.wifi.NanRangingIndication configRangingIndications;		android.hardware.wifi.NanRangingIndication configRangingIndications;
	char distanceIngressCm;		char distanceIngressCm;
	char distanceEgressCm;		char distanceEgressCm;
			boolean enableSessionSuspendability;
	}		}

wifi/aidl/android/hardware/wifi/NanDiscoveryCommonConfig.aidl

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -155,4 +155,10 @@ parcelable NanDiscoveryCommonConfig {
	*/		*/
	char distanceIngressCm;		char distanceIngressCm;
	char distanceEgressCm;		char distanceEgressCm;
			/**
			* Specifies whether suspension can be possible in this discovery session.
			* The request would fail if \|enableSessionSuspendability\| is true but
			* \|NanCapabilities.supportsSuspension\| is false.
			*/
			boolean enableSessionSuspendability;
	}		}

wifi/aidl/default/aidl_struct_util.cpp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1850,6 +1850,7 @@ bool convertAidlNanPublishRequestToLegacy(const NanPublishRequest& aidl_request,
	LOG(ERROR) << "convertAidlNanPublishRequestToLegacy: invalid pairing config";		LOG(ERROR) << "convertAidlNanPublishRequestToLegacy: invalid pairing config";
	return false;		return false;
	}		}
			legacy_request->enable_suspendability = aidl_request.baseConfigs.enableSessionSuspendability;

	return true;		return true;
	}		}
	@@ -1996,6 +1997,8 @@ bool convertAidlNanSubscribeRequestToLegacy(const NanSubscribeRequest& aidl_requ
	LOG(ERROR) << "convertAidlNanSubscribeRequestToLegacy: invalid pairing config";		LOG(ERROR) << "convertAidlNanSubscribeRequestToLegacy: invalid pairing config";
	return false;		return false;
	}		}
			legacy_request->enable_suspendability = aidl_request.baseConfigs.enableSessionSuspendability;

	return true;		return true;
	}		}