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

Commit 3e2ef57b authored by Manaswini Paluri's avatar Manaswini Paluri Committed by Gabriel Biren
Browse files

Add support for NAN periodic ranging in AIDL 

Add a flag to indicate NAN periodic ranging capability
in NanCapabilities. Add rtt burst size, rtt preamble
and channel info paramters in NanDiscoveryCommonConfig and
add rangingResultsRequired field in NanPublishRequest. Also,
add support for receiving ranging results as callback via
notifyRangingResults interface.

Bug: 336376538
Test: m
Test: vts tests
Change-Id: I3ef1e543747ac6a258905f39b6028568dffa250a
parent 54f806e4

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

+1 −0
Original line number Diff line number Diff line
@@ -72,4 +72,5 @@ interface IWifiNanIfaceEventCallback { 
  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);

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

  oneway void notifyRangingResults(in android.hardware.wifi.RttResult[] results, in byte discoverySessionId);

}

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

+3 −0
Original line number Diff line number Diff line
@@ -54,4 +54,7 @@ parcelable NanCapabilities { 
  boolean supportsPairing;

  boolean supportsSetClusterId;

  boolean supportsSuspension;

  boolean supportsPeriodicRanging;

  android.hardware.wifi.RttBw maxSupportedBandwidth;

  int maxNumRxChainsSupported;

}

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

+3 −0
Original line number Diff line number Diff line
@@ -55,4 +55,7 @@ parcelable NanDiscoveryCommonConfig { 
  char distanceIngressCm;

  char distanceEgressCm;

  boolean enableSessionSuspendability;

  int rttBurstSize;

  android.hardware.wifi.RttPreamble preamble;

  @nullable android.hardware.wifi.WifiChannelInfo channelInfo;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -41,4 +41,5 @@ parcelable NanPublishRequest { 
  android.hardware.wifi.NanPairingConfig pairingConfig;

  byte[16] identityKey;

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

  boolean rangingResultsRequired;

}

wifi/aidl/android/hardware/wifi/IWifiNanIfaceEventCallback.aidl

+9 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.hardware.wifi.NanPairingConfirmInd; 
import android.hardware.wifi.NanPairingRequestInd;

import android.hardware.wifi.NanStatus;

import android.hardware.wifi.NanSuspensionModeChangeInd;

import android.hardware.wifi.RttResult;

/**

 * NAN Response and Asynchronous Event Callbacks.

 *
@@ -461,4 +462,12 @@ oneway interface IWifiNanIfaceEventCallback { 
     *        |NanStatusCode.INVALID_PAIRING_ID|

     */

    void notifyTerminatePairingResponse(in char id, in NanStatus status);



    /**

     * Callback is invoked when ranging results are available.

     *

     * @param results RttResult data.

     * @param discoverySessionId Discovery session ID.

     */

    void notifyRangingResults(in RttResult[] results, in byte discoverySessionId);

}