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

Commit e37f8956 authored by Sunil Ravi's avatar Sunil Ravi Committed by Android (Google) Code Review
Browse files

Merge "wifi: Support for Wi-Fi Direct R2" into main

parents 483f70d0 965053af
Loading
Loading
Loading
Loading
+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 BandMask {
  const int BAND_2_GHZ = (1 << 0) /* 1 */;
  const int BAND_5_GHZ = (1 << 1) /* 2 */;
  const int BAND_6_GHZ = (1 << 2) /* 4 */;
}
+8 −0
Original line number Diff line number Diff line
@@ -74,6 +74,9 @@ interface ISupplicantP2pIface {
  android.hardware.wifi.supplicant.IfaceType getType();
  void invite(in String groupIfName, in byte[] goDeviceAddress, in byte[] peerAddress);
  int[] listNetworks();
  /**
   * @deprecated This method is deprecated from AIDL v4, newer HALs should use provisionDiscoveryWithParams.
   */
  void provisionDiscovery(in byte[] peerAddress, in android.hardware.wifi.supplicant.WpsProvisionMethod provisionMethod);
  void registerCallback(in android.hardware.wifi.supplicant.ISupplicantP2pIfaceCallback callback);
  void reinvoke(in int persistentNetworkId, in byte[] peerAddress);
@@ -124,6 +127,11 @@ interface ISupplicantP2pIface {
  void addGroupWithConfigurationParams(in android.hardware.wifi.supplicant.P2pAddGroupConfigurationParams groupConfigurationParams);
  void createGroupOwner(in android.hardware.wifi.supplicant.P2pCreateGroupOwnerInfo groupOwnerInfo);
  long getFeatureSet();
  int startUsdBasedServiceDiscovery(in android.hardware.wifi.supplicant.P2pUsdBasedServiceDiscoveryConfig serviceDiscoveryConfig);
  void stopUsdBasedServiceDiscovery(in int sessionId);
  int startUsdBasedServiceAdvertisement(in android.hardware.wifi.supplicant.P2pUsdBasedServiceAdvertisementConfig serviceAdvertisementConfig);
  void stopUsdBasedServiceAdvertisement(in int sessionId);
  void provisionDiscoveryWithParams(in android.hardware.wifi.supplicant.P2pProvisionDiscoveryParams params);
  const long P2P_FEATURE_V2 = (1 << 0) /* 1 */;
  const long P2P_FEATURE_PCC_MODE_WPA3_COMPATIBILITY = (1 << 1) /* 2 */;
}
+3 −0
Original line number Diff line number Diff line
@@ -80,4 +80,7 @@ interface ISupplicantP2pIfaceCallback {
  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);
  oneway void onUsdBasedServiceDiscoveryResult(in android.hardware.wifi.supplicant.P2pUsdBasedServiceDiscoveryResultParams params);
  oneway void onUsdBasedServiceDiscoveryTerminated(in int sessionId, in android.hardware.wifi.supplicant.UsdTerminateReasonCode reasonCode);
  oneway void onUsdBasedServiceAdvertisementTerminated(in int sessionId, in android.hardware.wifi.supplicant.UsdTerminateReasonCode reasonCode);
}
+2 −0
Original line number Diff line number Diff line
@@ -41,4 +41,6 @@ parcelable P2pConnectInfo {
  boolean persistent;
  int goIntent;
  @nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;
  int pairingBootstrappingMethod;
  @nullable String password;
}
+1 −0
Original line number Diff line number Diff line
@@ -37,4 +37,5 @@ parcelable P2pCreateGroupOwnerInfo {
  boolean persistent;
  int persistentNetworkId;
  @nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;
  boolean isP2pV2;
}
Loading