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

Commit 88f92d2b authored by Sunil Ravi's avatar Sunil Ravi
Browse files

Support for BLE assisted P2P discovery and pairing 

This CL includes,

1. An interface to generate a DIR info and to validate a received
DIR info.
2. Added a new bootstrapping method called BOOTSTRAPPING_OUT_OF_BAND which
will be set for bootsrapping done over BLE.
3. Added frequency field in connection request to use it for setting the channel for group
   formation, connection authorization and to join an existing GO.
4. Added authorize flag for supplicant to authorize a connection request
   from Peer.
5. Added group interface name in connection request for P2P GO to
   authorize a connection request.
6. Modified the API to reinvoke a persistent group supporting P2P
   version 2.
7. Added the DIR info in device found event.

Bug: 341971059
Test: Manual - Basic P2P connect/disconnect tests
Test: TH Presubmit tests
Test: atest VtsHalWifiSupplicantStaIfaceTargetTest \
      VtsHalWifiSupplicantStaNetworkTargetTest \
      VtsHalWifiSupplicantP2pIfaceTargetTest
Change-Id: I6b859c8c5f0aa4ed2226e5d1eb2734b77659e92b
parent ea1a2a18

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

+6 −0
Original line number Diff line number Diff line
@@ -79,6 +79,9 @@ interface ISupplicantP2pIface { 
   */

  void provisionDiscovery(in byte[] peerAddress, in android.hardware.wifi.supplicant.WpsProvisionMethod provisionMethod);

  void registerCallback(in android.hardware.wifi.supplicant.ISupplicantP2pIfaceCallback callback);

  /**

   * @deprecated This method is deprecated from AIDL v4, newer HALs should use reinvokePersistentGroup.

   */

  void reinvoke(in int persistentNetworkId, in byte[] peerAddress);

  void reject(in byte[] peerAddress);

  void removeBonjourService(in byte[] query);
@@ -132,6 +135,9 @@ interface ISupplicantP2pIface { 
  int startUsdBasedServiceAdvertisement(in android.hardware.wifi.supplicant.P2pUsdBasedServiceAdvertisementConfig serviceAdvertisementConfig);

  void stopUsdBasedServiceAdvertisement(in int sessionId);

  void provisionDiscoveryWithParams(in android.hardware.wifi.supplicant.P2pProvisionDiscoveryParams params);

  android.hardware.wifi.supplicant.P2pDirInfo getDirInfo();

  int validateDirInfo(in android.hardware.wifi.supplicant.P2pDirInfo dirInfo);

  void reinvokePersistentGroup(in android.hardware.wifi.supplicant.P2pReinvokePersistentGroupParams reinvokeGroupParams);

  const long P2P_FEATURE_V2 = (1 << 0) /* 1 */;

  const long P2P_FEATURE_PCC_MODE_WPA3_COMPATIBILITY = (1 << 1) /* 2 */;

}

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

+3 −0
Original line number Diff line number Diff line
@@ -43,4 +43,7 @@ parcelable P2pConnectInfo { 
  @nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;

  int pairingBootstrappingMethod;

  @nullable String password;

  int frequencyMHz;

  boolean authorizeConnectionFromPeer;

  @nullable String groupInterfaceName;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -46,4 +46,5 @@ parcelable P2pDeviceFoundEventParams { 
  byte[] vendorElemBytes;

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

  int pairingBootstrappingMethods;

  @nullable android.hardware.wifi.supplicant.P2pDirInfo dirInfo;

}

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

0 → 100644
+46 −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 P2pDirInfo {

  android.hardware.wifi.supplicant.P2pDirInfo.CipherVersion cipherVersion;

  byte[6] deviceInterfaceMacAddress;

  byte[] nonce;

  byte[] dirTag;

  @Backing(type="int") @VintfStability

  enum CipherVersion {

    NONE,

    DIRA_CIPHER_VERSION_128_BIT,

  }

}

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

+1 −0
Original line number Diff line number Diff line
@@ -39,4 +39,5 @@ parcelable P2pPairingBootstrappingMethodMask { 
  const int BOOTSTRAPPING_DISPLAY_PASSPHRASE = (1 << 2) /* 4 */;

  const int BOOTSTRAPPING_KEYPAD_PINCODE = (1 << 3) /* 8 */;

  const int BOOTSTRAPPING_KEYPAD_PASSPHRASE = (1 << 4) /* 16 */;

  const int BOOTSTRAPPING_OUT_OF_BAND = (1 << 5) /* 32 */;

}