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

Commit 0e270ef5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Convert NAN enums that are used as bitmaps to an int." into udc-dev

parents b77c7962 86971aa0

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

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ parcelable NanCapabilities { 
  int maxAppInfoLen;

  int maxQueuedTransmitFollowupMsgs;

  int maxSubscribeInterfaceAddresses;

  android.hardware.wifi.NanCipherSuiteType supportedCipherSuites;

  int supportedCipherSuites;

  boolean instantCommunicationModeSupportFlag;

  boolean supports6g;

  boolean supportsHe;

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

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ parcelable NanDiscoveryCommonConfig { 
  android.hardware.wifi.NanDataPathSecurityConfig securityConfig;

  boolean rangingRequired;

  int rangingIntervalMs;

  android.hardware.wifi.NanRangingIndication configRangingIndications;

  int configRangingIndications;

  char distanceIngressCm;

  char distanceEgressCm;

  boolean enableSessionSuspendability;

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

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ parcelable NanMatchInd { 
  boolean peerRequiresSecurityEnabledInNdp;

  boolean peerRequiresRanging;

  int rangingMeasurementInMm;

  android.hardware.wifi.NanRangingIndication rangingIndicationType;

  int rangingIndicationType;

  byte[] scid;

  android.hardware.wifi.NanPairingConfig peerPairingConfig;

  android.hardware.wifi.NanIdentityResolutionAttribute peerNira;

wifi/aidl/android/hardware/wifi/NanCapabilities.aidl

+2 −4
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package android.hardware.wifi;



import android.hardware.wifi.NanCipherSuiteType;



/**

 * NDP Capabilities response.

 */
@@ -78,9 +76,9 @@ parcelable NanCapabilities { 
     */

    int maxSubscribeInterfaceAddresses;

    /**

     * The set of supported Cipher suites. The |NanCipherSuiteType| bit fields are used.

     * Bitmap of |NanCipherSuiteType| values indicating the set of supported cipher suites.

     */

    NanCipherSuiteType supportedCipherSuites;

    int supportedCipherSuites;

    /**

     * Flag to indicate if instant communication mode is supported.

     */

wifi/aidl/android/hardware/wifi/NanDiscoveryCommonConfig.aidl

+4 −4
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package android.hardware.wifi; 


import android.hardware.wifi.NanDataPathSecurityConfig;

import android.hardware.wifi.NanMatchAlg;

import android.hardware.wifi.NanRangingIndication;



/**

 * Configurations of NAN discovery sessions. Common to publish and subscribe discovery.
@@ -143,10 +142,11 @@ parcelable NanDiscoveryCommonConfig { 
     */

    int rangingIntervalMs;

    /**

     * The type of ranging feedback to be provided by discovery session matches

     * |IWifiNanIfaceEventCallback.eventMatch|. Only relevant if |rangingRequired| is true.

     * Bitmap of |NanRangingIndication| values indicating the type of ranging feedback

     * to be provided by discovery session matches in |IWifiNanIfaceEventCallback.eventMatch|.

     * Only relevant if |rangingRequired| is true.

     */

    NanRangingIndication configRangingIndications;

    int configRangingIndications;

    /**

     * The ingress and egress distance in cm. If ranging is enabled (|rangingEnabled| is true) then

     * |configRangingIndications| is used to determine whether ingress and/or egress (or neither)