Merge "[NAN] Security configuration (cipher)" am: 0f9dc48b2c

am: f24303c6ec

Change-Id: Ic0f00c2987b47915300596569b0fcffaf20dcb08
This commit is contained in:
Etan Cohen 2017-02-21 17:59:03 +00:00 committed by android-build-merger
commit 1aa8b4f330

View file

@ -239,6 +239,7 @@ typedef enum {
} NanRangingAutoResponseCfg;
/* NAN Shared Key Security Cipher Suites Mask */
#define NAN_CIPHER_SUITE_SHARED_KEY_NONE 0x00
#define NAN_CIPHER_SUITE_SHARED_KEY_128_MASK 0x01
#define NAN_CIPHER_SUITE_SHARED_KEY_256_MASK 0x02