diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-10-11 05:00:02 +0000 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-10-11 05:00:02 +0000 |
| commit | 791f018bfb112c5e59f72fde10d51caa25fb162e (patch) | |
| tree | d2f64e96175f97f8c381714f3b8b1a0a096a9102 /hals | |
| parent | fc19dbcca30575ae8d92f812ee05351cb8354af7 (diff) | |
| parent | d83e225d40bd38b1cb3e0eb1bf984e8d23b89278 (diff) | |
| download | android-791f018bfb112c5e59f72fde10d51caa25fb162e.tar.gz | |
Snap for 5933730 from d83e225d40bd38b1cb3e0eb1bf984e8d23b89278 to simpleperf-release
Change-Id: I4efe6ab53e59c4df76ea69c7ea599130182c543b
Diffstat (limited to 'hals')
| -rw-r--r-- | hals/Android.bp | 1 | ||||
| -rw-r--r-- | hals/keymaster/Android.bp | 2 | ||||
| -rw-r--r-- | hals/keymaster/buffer.cpp | 1 | ||||
| -rw-r--r-- | hals/keymaster/citadel/Android.bp | 1 | ||||
| -rw-r--r-- | hals/keymaster/proto_utils.cpp | 4 |
5 files changed, 5 insertions, 4 deletions
diff --git a/hals/Android.bp b/hals/Android.bp index 4b004a7..2ab832a 100644 --- a/hals/Android.bp +++ b/hals/Android.bp @@ -22,7 +22,6 @@ cc_defaults { shared_libs: [ "libbase", "libhidlbase", - "libhidltransport", "libnos", "libnosprotos", "libutils", diff --git a/hals/keymaster/Android.bp b/hals/keymaster/Android.bp index b956e20..7d75562 100644 --- a/hals/keymaster/Android.bp +++ b/hals/keymaster/Android.bp @@ -37,7 +37,7 @@ cc_library { "libcrypto", "libprotobuf-cpp-full", "nos_app_keymaster", - "libhidltransport", + "libhidlbase", ], export_include_dirs: ["include"], } diff --git a/hals/keymaster/buffer.cpp b/hals/keymaster/buffer.cpp index 35a7d4f..89feadc 100644 --- a/hals/keymaster/buffer.cpp +++ b/hals/keymaster/buffer.cpp @@ -56,6 +56,7 @@ public: case Algorithm::EC: case Algorithm::HMAC: _blockSize = 0; + break; default: break; } diff --git a/hals/keymaster/citadel/Android.bp b/hals/keymaster/citadel/Android.bp index c62578a..f9a7dec 100644 --- a/hals/keymaster/citadel/Android.bp +++ b/hals/keymaster/citadel/Android.bp @@ -24,7 +24,6 @@ cc_binary { shared_libs: [ "libbase", "libhidlbase", - "libhidltransport", "libnos", "libnosprotos", "libutils", diff --git a/hals/keymaster/proto_utils.cpp b/hals/keymaster/proto_utils.cpp index a1fbfb0..03c7b43 100644 --- a/hals/keymaster/proto_utils.cpp +++ b/hals/keymaster/proto_utils.cpp @@ -789,9 +789,11 @@ ErrorCode hidl_params_to_map(const hidl_vec<KeyParameter>& params, // Duplicates not allowed for these tags types. return ErrorCode::INVALID_ARGUMENT; } - /* Fall-through! */ + FALLTHROUGH_INTENDED; case TagType::ENUM_REP: + FALLTHROUGH_INTENDED; case TagType::UINT_REP: + FALLTHROUGH_INTENDED; case TagType::ULONG_REP: if (tag_map->find(params[i].tag) == tag_map->end()) { vector<KeyParameter> v{params[i]}; |