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

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

Merge "Change the value of constant according to the spec" into udc-dev

parents 1b05cb6d cdf2ef0b

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

+2 −2
Original line number Diff line number Diff line
@@ -39,6 +39,6 @@ enum NanCipherSuiteType { 
  SHARED_KEY_256_MASK = (1 << 1) /* 2 */,

  PUBLIC_KEY_2WDH_128_MASK = (1 << 2) /* 4 */,

  PUBLIC_KEY_2WDH_256_MASK = (1 << 3) /* 8 */,

  PUBLIC_KEY_PASN_128_MASK = (1 << 4) /* 16 */,

  PUBLIC_KEY_PASN_256_MASK = (1 << 5) /* 32 */,

  PUBLIC_KEY_PASN_128_MASK = (1 << 6) /* 64 */,

  PUBLIC_KEY_PASN_256_MASK = (1 << 7) /* 128 */,

}

wifi/aidl/android/hardware/wifi/NanBootstrappingConfirmInd.aidl

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



    /**

     * Cookie received from the comeback response.

     * Cookie received from peer with |comeBackDelay| for follow up |NanBootstrappingRequest|

     */

    byte[] cookie;

}

wifi/aidl/android/hardware/wifi/NanBootstrappingRequest.aidl

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ parcelable NanBootstrappingRequest { 
    NanBootstrappingMethod requestBootstrappingMethod;



    /**

     * Cookie for the follow up request

     * Cookie received from previous |NanBootstrappingConfirmInd| for comeback request.

     */

    byte[] cookie;

}

wifi/aidl/android/hardware/wifi/NanCipherSuiteType.aidl

+13 −3
Original line number Diff line number Diff line
@@ -17,13 +17,19 @@ 
package android.hardware.wifi;



/**

 * Cipher suite flags. Wi-Fi Aware Specification 4.0 section 7.1.2

 * Cipher suite flags. Wi-Fi Aware Specification 4.0 section 9.5.21.1.

 */

@VintfStability

@Backing(type="int")

enum NanCipherSuiteType {

    NONE = 0,

    /**

     *  NCS-SK-128

     */

    SHARED_KEY_128_MASK = 1 << 0,

    /**

     *  NCS-SK-256

     */

    SHARED_KEY_256_MASK = 1 << 1,

    /**

     *  NCS-PK-2WDH-128
@@ -33,12 +39,16 @@ enum NanCipherSuiteType { 
     *  NCS-PK-2WDH-256

     */

    PUBLIC_KEY_2WDH_256_MASK = 1 << 3,

    /**

     * bit 4 and bit 5 are reserved for NCS-GTK-CCMP-128 and NCS-GTK-CCMP-256. Which are not used

     * from framework

     */

    /**

     *  NCS-PK-PASN-128

     */

    PUBLIC_KEY_PASN_128_MASK = 1 << 4,

    PUBLIC_KEY_PASN_128_MASK = 1 << 6,

    /**

     *  NCS-PK-PASN-256

     */

    PUBLIC_KEY_PASN_256_MASK = 1 << 5,

    PUBLIC_KEY_PASN_256_MASK = 1 << 7,

}

wifi/aidl/android/hardware/wifi/NanSuspensionModeChangeInd.aidl

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ package android.hardware.wifi; 
@VintfStability

parcelable NanSuspensionModeChangeInd {

    /**

     * Indication whether the device has entered or existed the NAN suspension mode(deep sleep)

     * Indication whether the device has entered or exited the NAN suspension mode(deep sleep)

     */

    boolean isSuspended;

}