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

Commit ef08aba9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add support for NAN periodic ranging in AIDL" into main

parents 2a047917 3e2ef57b

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);

}