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

Commit 09403b0f authored by Nate(Qiang) Jiang's avatar Nate(Qiang) Jiang Committed by Android (Google) Code Review
Browse files

Merge changes from topic "aware4" 

* changes:
  Add Shim layer for new HAL about Aware pairing
  [HAL] Support Wifi Aware 4.0
parents 6c8d39e9 38e8db5d

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

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ interface IWifiNanIface { 
  void stopSubscribeRequest(in char cmdId, in byte sessionId);

  void terminateDataPathRequest(in char cmdId, in int ndpInstanceId);

  void transmitFollowupRequest(in char cmdId, in android.hardware.wifi.NanTransmitFollowupRequest msg);

  void initiatePairingRequest(in char cmdId, in android.hardware.wifi.NanPairingRequest msg);

  void respondToPairingIndicationRequest(in char cmdId, in android.hardware.wifi.NanRespondToPairingIndicationRequest msg);

  void initiateBootstrappingRequest(in char cmdId, in android.hardware.wifi.NanBootstrappingRequest msg);

  void respondToBootstrappingIndicationRequest(in char cmdId, in android.hardware.wifi.NanBootstrappingResponse msg);

  const int MIN_DATA_PATH_CONFIG_PASSPHRASE_LENGTH = 8;

  const int MAX_DATA_PATH_CONFIG_PASSPHRASE_LENGTH = 63;

}

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

+8 −0
Original line number Diff line number Diff line
@@ -60,4 +60,12 @@ interface IWifiNanIfaceEventCallback { 
  oneway void notifyStopSubscribeResponse(in char id, in android.hardware.wifi.NanStatus status);

  oneway void notifyTerminateDataPathResponse(in char id, in android.hardware.wifi.NanStatus status);

  oneway void notifyTransmitFollowupResponse(in char id, in android.hardware.wifi.NanStatus status);

  oneway void eventPairingRequest(in android.hardware.wifi.NanPairingRequestInd event);

  oneway void eventPairingConfirm(in android.hardware.wifi.NanPairingConfirmInd event);

  oneway void notifyInitiatePairingResponse(in char id, in android.hardware.wifi.NanStatus status, in int pairingInstanceId);

  oneway void notifyRespondToPairingIndicationResponse(in char id, in android.hardware.wifi.NanStatus status);

  oneway void eventBootstrappingRequest(in android.hardware.wifi.NanBootstrappingRequestInd event);

  oneway void eventBootstrappingConfirm(in android.hardware.wifi.NanBootstrappingConfirmInd event);

  oneway void notifyInitiateBootstrappingResponse(in char id, in android.hardware.wifi.NanStatus status, in int bootstrappingInstanceId);

  oneway void notifyRespondToBootstrappingIndicationResponse(in char id, in android.hardware.wifi.NanStatus status);

}

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

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

 * Copyright (C) 2022 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;

@VintfStability

parcelable NanBootstrappingConfirmInd {

  int bootstrappingInstanceId;

  boolean acceptRequest;

  android.hardware.wifi.NanStatus reasonCode;

}

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

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

 * Copyright (C) 2022 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;

@Backing(type="int") @VintfStability

enum NanBootstrappingMethod {

  BOOTSTRAPPING_OPPORTUNISTIC_MASK = 1,

  BOOTSTRAPPING_PIN_CODE_DISPLAY_MASK = 2,

  BOOTSTRAPPING_PASSPHRASE_DISPLAY_MASK = 4,

  BOOTSTRAPPING_QR_DISPLAY_MASK = 8,

  BOOTSTRAPPING_NFC_TAG_MASK = 16,

  BOOTSTRAPPING_PIN_CODE_KEYPAD_MASK = 32,

  BOOTSTRAPPING_PASSPHRASE_KEYPAD_MASK = 64,

  BOOTSTRAPPING_QR_SCAN_MASK = 128,

  BOOTSTRAPPING_NFC_READER_MASK = 256,

  BOOTSTRAPPING_SERVICE_MANAGED_MASK = 16384,

  BOOTSTRAPPING_HANDSHAKE_SHIP_MASK = 32768,

}

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

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

 * Copyright (C) 2022 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;

@VintfStability

parcelable NanBootstrappingRequest {

  int peerId;

  byte[6] peerDiscMacAddr;

  android.hardware.wifi.NanBootstrappingMethod requestBootstrappingMethod;

}