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

Commit 338dbe00 authored by Vinay Gannevaram's avatar Vinay Gannevaram Committed by Sunil Ravi
Browse files

Add p2p methods for add group, go Negotiation and Invitation 

Add addGroupWithParams, onGoNegotiationRequestWithParams and
onInvitationReceivedWithParams to P2P Supplicant interface with
vendor data as an optional parameter. Also deprecates the previous
addGroup, onGoNegotiationRequest and onInvitationReceived.

Bug: 296069900
Test: Build successfully
Change-Id: I475df52fe087aff39728e2567583b48b7484a7ee
parent fda43ac8

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

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ package android.hardware.wifi.supplicant; 
@VintfStability

interface ISupplicantP2pIface {

  void addBonjourService(in byte[] query, in byte[] response);

  /**

   * @deprecated This method is deprecated from AIDL v3, newer HALs should use createGroupOwner.

   */

  void addGroup(in boolean persistent, in int persistentNetworkId);

  /**

   * @deprecated This method is deprecated from AIDL v3, newer HALs should use addGroupWithConfigurationParams.
@@ -119,4 +122,5 @@ interface ISupplicantP2pIface { 
  void findWithParams(in android.hardware.wifi.supplicant.P2pDiscoveryInfo discoveryInfo);

  void configureExtListenWithParams(in android.hardware.wifi.supplicant.P2pExtListenInfo extListenInfo);

  void addGroupWithConfigurationParams(in android.hardware.wifi.supplicant.P2pAddGroupConfigurationParams groupConfigurationParams);

  void createGroupOwner(in android.hardware.wifi.supplicant.P2pCreateGroupOwnerInfo groupOwnerInfo);

}

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

+8 −0
Original line number Diff line number Diff line
@@ -41,11 +41,17 @@ interface ISupplicantP2pIfaceCallback { 
  oneway void onDeviceLost(in byte[] p2pDeviceAddress);

  oneway void onFindStopped();

  oneway void onGoNegotiationCompleted(in android.hardware.wifi.supplicant.P2pStatusCode status);

  /**

   * @deprecated This method is deprecated from AIDL v3, newer HALs should use onGoNegotiationRequestWithParams.

   */

  oneway void onGoNegotiationRequest(in byte[] srcAddress, in android.hardware.wifi.supplicant.WpsDevPasswordId passwordId);

  oneway void onGroupFormationFailure(in String failureReason);

  oneway void onGroupFormationSuccess();

  oneway void onGroupRemoved(in String groupIfname, in boolean isGroupOwner);

  oneway void onGroupStarted(in String groupIfname, in boolean isGroupOwner, in byte[] ssid, in int frequency, in byte[] psk, in String passphrase, in byte[] goDeviceAddress, in boolean isPersistent);

  /**

   * @deprecated This method is deprecated from AIDL v3, newer HALs should use onInvitationReceivedWithParams.

   */

  oneway void onInvitationReceived(in byte[] srcAddress, in byte[] goDeviceAddress, in byte[] bssid, in int persistentNetworkId, in int operatingFrequency);

  oneway void onInvitationResult(in byte[] bssid, in android.hardware.wifi.supplicant.P2pStatusCode status);

  /**
@@ -72,4 +78,6 @@ interface ISupplicantP2pIfaceCallback { 
  oneway void onPeerClientDisconnected(in android.hardware.wifi.supplicant.P2pPeerClientDisconnectedEventParams clientDisconnectedEventParams);

  oneway void onProvisionDiscoveryCompletedEvent(in android.hardware.wifi.supplicant.P2pProvisionDiscoveryCompletedEventParams provisionDiscoveryCompletedEventParams);

  oneway void onDeviceFoundWithParams(in android.hardware.wifi.supplicant.P2pDeviceFoundEventParams deviceFoundEventParams);

  oneway void onGoNegotiationRequestWithParams(in android.hardware.wifi.supplicant.P2pGoNegotiationReqEventParams params);

  oneway void onInvitationReceivedWithParams(in android.hardware.wifi.supplicant.P2pInvitationEventParams params);

}

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

+1 −0
Original line number Diff line number Diff line
@@ -41,4 +41,5 @@ parcelable P2pAddGroupConfigurationParams { 
  byte[6] goInterfaceAddress;

  boolean joinExistingGroup;

  int keyMgmtMask;

  @nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;

}

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

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.wifi.supplicant;

@VintfStability

parcelable P2pCreateGroupOwnerInfo {

  boolean persistent;

  int persistentNetworkId;

  @nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;

}

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

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.wifi.supplicant;

@VintfStability

parcelable P2pGoNegotiationReqEventParams {

  byte[6] srcAddress;

  android.hardware.wifi.supplicant.WpsDevPasswordId passwordId;

  @nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;

}