diff options
| author | Janis Danisevskis <jdanis@google.com> | 2018-11-12 17:48:26 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-12 17:48:26 -0800 |
| commit | 7f3995f7f5ee3a40d1ee221637a2c4612dfc5f08 (patch) | |
| tree | 725abf689054fb833fa4120df576de8338b6a321 /keymaster | |
| parent | a891b2b6d2b5eccf5a675794cf9f94b91c0a5b42 (diff) | |
| parent | bb222282d55cdb371b927fd72cfc318ac925f55b (diff) | |
| download | android_hardware_interfaces-7f3995f7f5ee3a40d1ee221637a2c4612dfc5f08.tar.gz android_hardware_interfaces-7f3995f7f5ee3a40d1ee221637a2c4612dfc5f08.tar.bz2 android_hardware_interfaces-7f3995f7f5ee3a40d1ee221637a2c4612dfc5f08.zip | |
Merge "authorization_set.cpp: relax serialization of unknown tags" am: 949ab7dbb9 am: eba18e906f
am: bb222282d5
Change-Id: Ie59897dbe8e3fc0b9812067da2dded2233f57289
Diffstat (limited to 'keymaster')
| -rw-r--r-- | keymaster/4.0/support/authorization_set.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/keymaster/4.0/support/authorization_set.cpp b/keymaster/4.0/support/authorization_set.cpp index 10d272a9b..b6cba616a 100644 --- a/keymaster/4.0/support/authorization_set.cpp +++ b/keymaster/4.0/support/authorization_set.cpp @@ -261,9 +261,8 @@ struct choose_serializer<MetaList<Tags...>> { template <> struct choose_serializer<> { static OutStreams& serialize(OutStreams& out, const KeyParameter& param) { - LOG(FATAL) << "Trying to serialize unknown tag " << unsigned(param.tag) + LOG(ERROR) << "Trying to serialize unknown tag " << unsigned(param.tag) << ". Did you forget to add it to all_tags_t?"; - abort(); return out; } }; |