am 5d8d3981: Merge "Start authenticator numbering from 1, instead of 2."

* commit '5d8d398186c87f91de9d1a3384c2a5fdde05fd6a':
  Start authenticator numbering from 1, instead of 2.
This commit is contained in:
Shawn Willden
2015-04-09 23:43:37 +00:00
committed by Android Git Automerger

View File

@@ -25,8 +25,8 @@ extern "C" {
typedef enum { typedef enum {
HW_AUTH_NONE = 0, HW_AUTH_NONE = 0,
HW_AUTH_PASSWORD = 1 << 1, HW_AUTH_PASSWORD = 1 << 0,
HW_AUTH_FINGERPRINT = 1 << 2, HW_AUTH_FINGERPRINT = 1 << 1,
// Additional entries should be powers of 2. // Additional entries should be powers of 2.
HW_AUTH_ANY = UINT32_MAX, HW_AUTH_ANY = UINT32_MAX,
} hw_authenticator_type_t; } hw_authenticator_type_t;