tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "supplicant(interface): Correct the WFD info length" am: d51c817675

Browse source 
am: f092ffbe9d

Change-Id: I9bcfb6f174f7387956bbec423175e39004235782
This commit is contained in:
Roshan Pius 2017-03-20 21:38:58 +00:00 committed by android-build-merger
commit bf6ce1a507
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wifi/supplicant/1.0/ISupplicantP2pIface.hal
View file

@ -611,7 +611,7 @@ interface ISupplicantP2pIface extends ISupplicantIface {
* |SupplicantStatusCode.FAILURE_UNKNOWN|, * |SupplicantStatusCode.FAILURE_UNKNOWN|,
* |SupplicantStatusCode.FAILURE_IFACE_INVALID| * |SupplicantStatusCode.FAILURE_IFACE_INVALID|
*/ */
setWfdDeviceInfo(uint8_t[8] info) generates (SupplicantStatus status); setWfdDeviceInfo(uint8_t[6] info) generates (SupplicantStatus status);
/** /**
* Creates a NFC handover request message. * Creates a NFC handover request message.

2
wifi/supplicant/1.0/ISupplicantP2pIfaceCallback.hal
View file

@ -105,7 +105,7 @@ interface ISupplicantP2pIfaceCallback {
MacAddress srcAddress, MacAddress p2pDeviceAddress, MacAddress srcAddress, MacAddress p2pDeviceAddress,
uint8_t[8] primaryDeviceType, string deviceName, uint8_t[8] primaryDeviceType, string deviceName,
bitfield<WpsConfigMethods> configMethods, uint8_t deviceCapabilities, bitfield<WpsConfigMethods> configMethods, uint8_t deviceCapabilities,
bitfield<P2pGroupCapabilityMask> groupCapabilities, uint8_t[8] wfdDeviceInfo); bitfield<P2pGroupCapabilityMask> groupCapabilities, uint8_t[6] wfdDeviceInfo);
/** /**
* Used to indicate that a P2P device has been lost. * Used to indicate that a P2P device has been lost.

2
wifi/supplicant/1.0/vts/functional/supplicant_p2p_iface_hidl_test.cpp
View file

@ -81,7 +81,7 @@ class IfaceCallback : public ISupplicantP2pIfaceCallback {
const hidl_array<uint8_t, 8>& /* primaryDeviceType */, const hidl_array<uint8_t, 8>& /* primaryDeviceType */,
const hidl_string& /* deviceName */, uint16_t /* configMethods */, const hidl_string& /* deviceName */, uint16_t /* configMethods */,
uint8_t /* deviceCapabilities */, uint32_t /* groupCapabilities */, uint8_t /* deviceCapabilities */, uint32_t /* groupCapabilities */,
const hidl_array<uint8_t, 8>& /* wfdDeviceInfo */) override { const hidl_array<uint8_t, 6>& /* wfdDeviceInfo */) override {
return Void(); return Void();
} }
Return<void> onDeviceLost( Return<void> onDeviceLost(