diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-03-15 22:34:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-15 22:34:49 +0000 |
| commit | ece36b43c3042747eebc26b7428d89a991bde729 (patch) | |
| tree | d01619abd0f5f655c11e9b513cd0448f8b9e9d7e | |
| parent | a0c5e5bf37fd8f01257377225afbc0eff826a618 (diff) | |
| parent | ae325e5f2b0549757cae7eee17e51632c2e24bbb (diff) | |
| download | keymaster-ece36b43c3042747eebc26b7428d89a991bde729.tar.gz | |
Merge "Change masked_tag() return type to match BoringSSL change." am: 4d768643e9 am: 3ba4c56dca am: bd0d7148a5 am: ae325e5f2b
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2480817
Change-Id: Icc7850494e29c202ba75465797b9e55185581d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | include/keymaster/keymaster_tags.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/keymaster/keymaster_tags.h b/include/keymaster/keymaster_tags.h index e8188e8..29eae7c 100644 --- a/include/keymaster/keymaster_tags.h +++ b/include/keymaster/keymaster_tags.h @@ -108,7 +108,7 @@ template <keymaster_tag_type_t tag_type, keymaster_tag_t tag> class TypedTag { // NOLINTNEXTLINE(google-explicit-constructor) inline operator keymaster_tag_t() { return tag; } // NOLINTNEXTLINE(google-runtime-int) - inline long masked_tag() { return static_cast<long>(keymaster_tag_mask_type(tag)); } + inline int masked_tag() { return static_cast<int>(keymaster_tag_mask_type(tag)); } }; template <keymaster_tag_type_t tag_type, keymaster_tag_t tag, typename KeymasterEnum> @@ -126,7 +126,7 @@ class TypedEnumTag { // NOLINTNEXTLINE(google-explicit-constructor) inline operator keymaster_tag_t() { return tag; } // NOLINTNEXTLINE(google-runtime-int) - inline long masked_tag() { return static_cast<long>(keymaster_tag_mask_type(tag)); } + inline int masked_tag() { return static_cast<int>(keymaster_tag_mask_type(tag)); } }; #ifdef KEYMASTER_NAME_TAGS |